gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

http3: fix graceful server shutdown (#4707)

Browse Source 
* close connHandlingDone once only when the server is shutting down

* close underlying listeners during graceful  shutdown when there is no connection

* remove connDoneOnce
This commit is contained in:
WeidiDeng
2024-10-22 13:35:35 +08:00
committed by GitHub
parent 6af2b1a478
commit 98de6aebf7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
http3/server.go
View File

@@ -285,7 +285,7 @@ func (s *Server) init() {
} }
func (s *Server) decreaseConnCount() { func (s *Server) decreaseConnCount() {
if s.connCount.Add(-1) == 0 { if s.connCount.Add(-1) == 0 && s.graceCtx.Err() != nil {
close(s.connHandlingDone) close(s.connHandlingDone)
} }
} }
@@ -762,7 +762,7 @@ func (s *Server) Shutdown(ctx context.Context) error {
s.mutex.Unlock() s.mutex.Unlock()
if s.connCount.Load() == 0 { if s.connCount.Load() == 0 {
return nil return s.Close()
} }
select { select {
case <-s.connHandlingDone: // all connections were closed case <-s.connHandlingDone: // all connections were closed