server: fix race between GracefulStop and new incoming connections (#1745) #1745
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dfawley
force-pushed
the
graceful_stop2
branch
from
8dda4ab
to
0e0c605
Compare
|
"context" was imported by |
MakMukhi
reviewed
Dec 18, 2017
test/gracefulstop_test.go
Outdated
| }() | ||
|
|
||
| fmt.Println("calling RPC") | ||
| time.Sleep(time.Second) |
There was a problem hiding this comment.
Accidental leftover from debugging. Also removed lots of fmt.Prints
server.go
Outdated
| @@ -511,7 +516,8 @@ func (s *Server) Serve(lis net.Listener) error { | |||
| timer := time.NewTimer(tempDelay) | |||
| select { | |||
| case <-timer.C: | |||
| case <-s.ctx.Done(): | |||
| case <-s.quit: | |||
| return nil | |||
| } | |||
| timer.Stop() | |||
There was a problem hiding this comment.
Not in your PR but we can get rid of this time.Stop() now that we're here.
There was a problem hiding this comment.
Moved to the appropriate place.
server.go
Outdated
| if !s.addConn(conn) { | ||
| conn.Close() | ||
| return | ||
| } | ||
| defer s.removeConn(conn) |
There was a problem hiding this comment.
Shouldn't this be deleted too?
MakMukhi
approved these changes
Dec 18, 2017
dfawley
changed the title
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1737
Updates #1738