server: fix race causing streams to be terminated by GracefulStop #2857
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
…velly Before this fix, stream is removed from activeStreams in finishStream, which happens when the service handler returns status, without waiting for the status to be sent by loopyWriter. If GracefulStop() is called in between, it will close the connection (because activeStreams is empty), which causes the RPC to fail with "transport is closing". This change moves the activeStreams cleanup into loopyWriter, after sending status on wire.
canguler
suggested changes
Jun 10, 2019
internal/transport/http2_server.go
Outdated
| // In case stream sending and receiving are invoked in separate | ||
| // goroutines (e.g., bi-directional streaming), cancel needs to be | ||
| // called to interrupt the potential blocking on other goroutines. | ||
| s.cancel() |
There was a problem hiding this comment.
I think we need to keep s.cancel() in deleteStream.
internal/transport/http2_server.go
Outdated
| @@ -1020,17 +1020,6 @@ func (t *http2Server) Close() error { | |||
|
|
|||
| // deleteStream deletes the stream s from transport's active streams. | |||
| func (t *http2Server) deleteStream(s *Stream, eosReceived bool) (oldState streamState) { | |||
There was a problem hiding this comment.
We no longer need to return anything.
easwars
reviewed
Jun 11, 2019
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.
Before this fix, stream is removed from activeStreams in finishStream,
which happens when the service handler returns status, without waiting
for the status to be sent by loopyWriter. If GracefulStop() is called in
between, it will close the connection (because activeStreams is empty),
which causes the RPC to fail with "transport is closing". This change
moves the activeStreams cleanup into loopyWriter, after sending status
on wire.
fixes #2703