mirror of
https://github.com/golang/go
synced 2024-09-29 03:24:29 -06:00
net/http: wait for listeners to exit in Server.Close and Shutdown
Avoid race conditions when a new connection is accepted just after Server.Close or Server.Shutdown is called by waiting for the listener goroutines to exit before proceeding to clean up active connections. No test because the mechanism required to trigger the race condition reliably requires such tight coupling to the Server internals that any test would be quite fragile in the face of reasonable refactorings. Fixes #48642 Updates #33313, #36819 Change-Id: I109a93362680991bf298e0a95637595dcaa884af Reviewed-on: https://go-review.googlesource.com/c/go/+/409537 TryBot-Result: Gopher Robot <gobot@golang.org> Run-TryBot: Damien Neil <dneil@google.com> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> Reviewed-by: Bryan Mills <bcmills@google.com>
This commit is contained in:
parent
14abe8aa73
commit
180bcad33d
@ -2690,6 +2690,8 @@ type Server struct {
|
|||||||
activeConn map[*conn]struct{}
|
activeConn map[*conn]struct{}
|
||||||
doneChan chan struct{}
|
doneChan chan struct{}
|
||||||
onShutdown []func()
|
onShutdown []func()
|
||||||
|
|
||||||
|
listenerGroup sync.WaitGroup
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) getDoneChan() <-chan struct{} {
|
func (s *Server) getDoneChan() <-chan struct{} {
|
||||||
@ -2732,6 +2734,15 @@ func (srv *Server) Close() error {
|
|||||||
defer srv.mu.Unlock()
|
defer srv.mu.Unlock()
|
||||||
srv.closeDoneChanLocked()
|
srv.closeDoneChanLocked()
|
||||||
err := srv.closeListenersLocked()
|
err := srv.closeListenersLocked()
|
||||||
|
|
||||||
|
// Unlock srv.mu while waiting for listenerGroup.
|
||||||
|
// The group Add and Done calls are made with srv.mu held,
|
||||||
|
// to avoid adding a new listener in the window between
|
||||||
|
// us setting inShutdown above and waiting here.
|
||||||
|
srv.mu.Unlock()
|
||||||
|
srv.listenerGroup.Wait()
|
||||||
|
srv.mu.Lock()
|
||||||
|
|
||||||
for c := range srv.activeConn {
|
for c := range srv.activeConn {
|
||||||
c.rwc.Close()
|
c.rwc.Close()
|
||||||
delete(srv.activeConn, c)
|
delete(srv.activeConn, c)
|
||||||
@ -2778,6 +2789,7 @@ func (srv *Server) Shutdown(ctx context.Context) error {
|
|||||||
go f()
|
go f()
|
||||||
}
|
}
|
||||||
srv.mu.Unlock()
|
srv.mu.Unlock()
|
||||||
|
srv.listenerGroup.Wait()
|
||||||
|
|
||||||
pollIntervalBase := time.Millisecond
|
pollIntervalBase := time.Millisecond
|
||||||
nextPollInterval := func() time.Duration {
|
nextPollInterval := func() time.Duration {
|
||||||
@ -2794,7 +2806,7 @@ func (srv *Server) Shutdown(ctx context.Context) error {
|
|||||||
timer := time.NewTimer(nextPollInterval())
|
timer := time.NewTimer(nextPollInterval())
|
||||||
defer timer.Stop()
|
defer timer.Stop()
|
||||||
for {
|
for {
|
||||||
if srv.closeIdleConns() && srv.numListeners() == 0 {
|
if srv.closeIdleConns() {
|
||||||
return lnerr
|
return lnerr
|
||||||
}
|
}
|
||||||
select {
|
select {
|
||||||
@ -2817,12 +2829,6 @@ func (srv *Server) RegisterOnShutdown(f func()) {
|
|||||||
srv.mu.Unlock()
|
srv.mu.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) numListeners() int {
|
|
||||||
s.mu.Lock()
|
|
||||||
defer s.mu.Unlock()
|
|
||||||
return len(s.listeners)
|
|
||||||
}
|
|
||||||
|
|
||||||
// closeIdleConns closes all idle connections and reports whether the
|
// closeIdleConns closes all idle connections and reports whether the
|
||||||
// server is quiescent.
|
// server is quiescent.
|
||||||
func (s *Server) closeIdleConns() bool {
|
func (s *Server) closeIdleConns() bool {
|
||||||
@ -3157,8 +3163,10 @@ func (s *Server) trackListener(ln *net.Listener, add bool) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
s.listeners[ln] = struct{}{}
|
s.listeners[ln] = struct{}{}
|
||||||
|
s.listenerGroup.Add(1)
|
||||||
} else {
|
} else {
|
||||||
delete(s.listeners, ln)
|
delete(s.listeners, ln)
|
||||||
|
s.listenerGroup.Done()
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user