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/00_serve.js | |
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/00_serve.js')
-rw-r--r-- | ext/http/00_serve.js | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/ext/http/00_serve.js b/ext/http/00_serve.js index 914205889..aeebca93d 100644 --- a/ext/http/00_serve.js +++ b/ext/http/00_serve.js @@ -4,7 +4,7 @@ const core = globalThis.Deno.core; const primordials = globalThis.__bootstrap.primordials; const internals = globalThis.__bootstrap.internals; -const { BadResourcePrototype } = core; +const { BadResourcePrototype, InterruptedPrototype } = core; import { InnerBody } from "ext:deno_fetch/22_body.js"; import { Event } from "ext:deno_web/02_event.js"; import { @@ -65,6 +65,8 @@ const { op_http_upgrade_websocket_next, op_http_try_wait, op_http_wait, + op_http_cancel, + op_http_close, } = core.ensureFastOps(); const _upgraded = Symbol("_upgraded"); @@ -334,11 +336,15 @@ class CallbackContext { fallbackHost; serverRid; closed; + closing; constructor(signal, args) { + // The abort signal triggers a non-graceful shutdown signal?.addEventListener( "abort", - () => this.close(), + () => { + op_http_cancel(this.serverRid, false); + }, { once: true }, ); this.abortController = new AbortController(); @@ -630,6 +636,9 @@ function serveHttpOn(context, callback) { if (ObjectPrototypeIsPrototypeOf(BadResourcePrototype, error)) { break; } + if (ObjectPrototypeIsPrototypeOf(InterruptedPrototype, error)) { + break; + } throw new Deno.errors.Http(error); } if (req === -1) { @@ -637,10 +646,24 @@ function serveHttpOn(context, callback) { } PromisePrototypeCatch(callback(req), promiseErrorHandler); } + + if (!context.closed && !context.closing) { + context.closed = true; + await op_http_close(rid, false); + context.close(); + } })(); return { finished, + async shutdown() { + if (!context.closed && !context.closing) { + // Shut this HTTP server down gracefully + context.closing = true; + await op_http_close(context.serverRid, true); + context.closed = true; + } + }, then() { throw new Error( "Deno.serve no longer returns a promise. await server.finished instead of server.", |