serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-26 13:43:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

caddyhttp: Close http3 server gracefully (#6213)

Browse source 
* close http3 server gracefully

* update server field

* update from upstream

---------

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
This commit is contained in:
WeidiDeng 2024-10-16 09:28:20 +08:00 committed by GitHub
parent a211c656f1
commit c6f2979986
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/caddyhttp/app.go
View file

@ -689,16 +689,7 @@ func (app *App) Stop() error {
return return
} }
// First close h3server then close listeners unlike stdlib for several reasons: if err := server.h3server.Shutdown(ctx); err != nil {
// 1, udp has only a single socket, once closed, no more data can be read and
// written. In contrast, closing tcp listeners won't affect established connections.
// This have something to do with graceful shutdown when upstream implements it.
// 2, h3server will only close listeners it's registered (quic listeners). Closing
// listener first and these listeners maybe unregistered thus won't be closed. caddy
// distinguishes quic-listener and underlying datagram sockets.
// TODO: CloseGracefully, once implemented upstream (see https://github.com/quic-go/quic-go/issues/2103)
if err := server.h3server.Close(); err != nil {
app.logger.Error("HTTP/3 server shutdown", app.logger.Error("HTTP/3 server shutdown",
zap.Error(err), zap.Error(err),
zap.Strings("addresses", server.Listen)) zap.Strings("addresses", server.Listen))

24
modules/caddyhttp/server.go
View file

@ -614,22 +614,7 @@ func (s *Server) serveHTTP3(addr caddy.NetworkAddress, tlsCfg *tls.Config) error
// create HTTP/3 server if not done already // create HTTP/3 server if not done already
if s.h3server == nil { if s.h3server == nil {
s.h3server = &http3.Server{ s.h3server = &http3.Server{
// Currently when closing a http3.Server, only listeners are closed. But caddy reuses these listeners Handler: s,
// if possible, requests are still read and handled by the old handler. Close these connections manually.
// see issue: https://github.com/caddyserver/caddy/issues/6195
// Will interrupt ongoing requests.
// TODO: remove the handler wrap after http3.Server.CloseGracefully is implemented, see App.Stop
Handler: http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
select {
case <-s.ctx.Done():
if quicConn, ok := request.Context().Value(quicConnCtxKey).(quic.Connection); ok {
//nolint:errcheck
quicConn.CloseWithError(quic.ApplicationErrorCode(http3.ErrCodeRequestRejected), "")
}
default:
s.ServeHTTP(writer, request)
}
}),
TLSConfig: tlsCfg, TLSConfig: tlsCfg,
MaxHeaderBytes: s.MaxHeaderBytes, MaxHeaderBytes: s.MaxHeaderBytes,
QUICConfig: &quic.Config{ QUICConfig: &quic.Config{
@ -637,9 +622,6 @@ func (s *Server) serveHTTP3(addr caddy.NetworkAddress, tlsCfg *tls.Config) error
Tracer: qlog.DefaultConnectionTracer, Tracer: qlog.DefaultConnectionTracer,
}, },
IdleTimeout: time.Duration(s.IdleTimeout), IdleTimeout: time.Duration(s.IdleTimeout),
ConnContext: func(ctx context.Context, c quic.Connection) context.Context {
return context.WithValue(ctx, quicConnCtxKey, c)
},
} }
} }
@ -1099,10 +1081,6 @@ const (
// For referencing underlying net.Conn // For referencing underlying net.Conn
ConnCtxKey caddy.CtxKey = "conn" ConnCtxKey caddy.CtxKey = "conn"
// For referencing underlying quic.Connection
// TODO: export if needed later
quicConnCtxKey caddy.CtxKey = "quic_conn"
// For tracking whether the client is a trusted proxy // For tracking whether the client is a trusted proxy
TrustedProxyVarKey string = "trusted_proxy" TrustedProxyVarKey string = "trusted_proxy"