diff options
| author | Matt Mastracci <matthew@mastracci.com> | 2023-09-11 18:06:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-12 00:06:38 +0000 |
| commit | 950e0e9cd65bd634d59fe60d5a0cb8651958c7fb (patch) | |
| tree | 400dd0eaacf7ce1018a07e2e232e6d62f54112ad /ext/http/slab.rs | |
| parent | bfd230fd78ef7867eec75e6b21715f51e72e7a23 (diff) | |
fix(ext/http): create a graceful shutdown API (#20387)
This PR implements a graceful shutdown API for Deno.serve, allowing all
current connections to drain from the server before shutting down, while
preventing new connections from being started or new transactions on
existing connections from being created.
We split the cancellation handle into two parts: a listener handle, and
a connection handle. A graceful shutdown cancels the listener only,
while allowing the connections to drain. The connection handle aborts
all futures. If the listener handle is cancelled, we put the connections
into graceful shutdown mode, which disables keep-alive on http/1.1 and
uses http/2 mechanisms for http/2 connections.
In addition, we now guarantee that all connections are complete or
cancelled, and all resources are cleaned up when the server `finished`
promise resolves -- we use a Rust-side server refcount for this.
Performance impact: does not appear to affect basic serving performance
by more than 1% (~126k -> ~125k)
---------
Co-authored-by: Bartek IwaĆczuk <biwanczuk@gmail.com>
Diffstat (limited to 'ext/http/slab.rs')
| -rw-r--r-- | ext/http/slab.rs | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/ext/http/slab.rs b/ext/http/slab.rs index 8dd562cc2..4718aded1 100644 --- a/ext/http/slab.rs +++ b/ext/http/slab.rs @@ -20,6 +20,10 @@ pub type Request = hyper1::Request<Incoming>; pub type Response = hyper1::Response<ResponseBytes>; pub type SlabId = u32; +#[repr(transparent)] +#[derive(Clone, Default)] +pub struct RefCount(pub Rc<()>); + enum RequestBodyState { Incoming(Incoming), Resource(HttpRequestBodyAutocloser), @@ -50,24 +54,27 @@ pub struct HttpSlabRecord { request_info: HttpConnectionProperties, request_parts: Parts, request_body: Option<RequestBodyState>, - // The response may get taken before we tear this down + /// The response may get taken before we tear this down response: Option<Response>, promise: CompletionHandle, trailers: Rc<RefCell<Option<HeaderMap>>>, been_dropped: bool, + /// Use a `Rc` to keep track of outstanding requests. We don't use this, but + /// when it drops, it decrements the refcount of the server itself. + refcount: Option<RefCount>, #[cfg(feature = "__zombie_http_tracking")] alive: bool, } thread_local! { - static SLAB: RefCell<Slab<HttpSlabRecord>> = const { RefCell::new(Slab::new()) }; + pub(crate) static SLAB: RefCell<Slab<HttpSlabRecord>> = const { RefCell::new(Slab::new()) }; } macro_rules! http_trace { ($index:expr, $args:tt) => { #[cfg(feature = "__http_tracing")] { - let total = SLAB.with(|x| x.try_borrow().map(|x| x.len())); + let total = $crate::slab::SLAB.with(|x| x.try_borrow().map(|x| x.len())); if let Ok(total) = total { println!("HTTP id={} total={}: {}", $index, total, format!($args)); } else { @@ -77,6 +84,8 @@ macro_rules! http_trace { }; } +pub(crate) use http_trace; + /// Hold a lock on the slab table and a reference to one entry in the table. pub struct SlabEntry( NonNull<HttpSlabRecord>, @@ -121,6 +130,7 @@ fn slab_insert_raw( request_parts: Parts, request_body: Option<Incoming>, request_info: HttpConnectionProperties, + refcount: RefCount, ) -> SlabId { let index = SLAB.with(|slab| { let mut slab = slab.borrow_mut(); @@ -135,6 +145,7 @@ fn slab_insert_raw( trailers, been_dropped: false, promise: CompletionHandle::default(), + refcount: Some(refcount), #[cfg(feature = "__zombie_http_tracking")] alive: true, }) @@ -146,9 +157,10 @@ fn slab_insert_raw( pub fn slab_insert( request: Request, request_info: HttpConnectionProperties, + refcount: RefCount, ) -> SlabId { let (request_parts, request_body) = request.into_parts(); - slab_insert_raw(request_parts, Some(request_body), request_info) + slab_insert_raw(request_parts, Some(request_body), request_info, refcount) } pub fn slab_drop(index: SlabId) { @@ -159,10 +171,21 @@ pub fn slab_drop(index: SlabId) { !record.been_dropped, "HTTP state error: Entry has already been dropped" ); + + // The logic here is somewhat complicated. A slab record cannot be expunged until it has been dropped by Rust AND + // the promise has been completed (indicating that JavaScript is done processing). However, if Rust has finished + // dealing with this entry, we DO want to clean up some of the associated items -- namely the request body, which + // might include actual resources, and the refcount, which is keeping the server alive. record.been_dropped = true; if record.promise.is_completed() { drop(entry); slab_expunge(index); + } else { + // Take the request body, as the future has been dropped and this will allow some resources to close + record.request_body.take(); + // Take the refcount keeping the server alive. The future is no longer alive, which means this request + // is toast. + record.refcount.take(); } } @@ -318,6 +341,7 @@ mod tests { local_port: None, stream_type: NetworkStreamType::Tcp, }, + RefCount::default(), ); let entry = slab_get(id); entry.complete(); |
