Issue #1060 maximum number of streams on the client should be capped … #1071
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
…ped at 100 by default
2. Defer adding back to streamsQuota pool in CloseStream
menghanl
reviewed
Mar 1, 2017
transport/http2_client.go
Outdated
| } | ||
| var rstStream bool | ||
| defer func() { | ||
| if !rstStream { |
There was a problem hiding this comment.
Add comments here to explain what rstStream means and our special handling for streams quota pool.
transport/http2_client.go
Outdated
| @@ -1085,6 +1068,7 @@ func (t *http2Client) controller() { | |||
| t.framer.writeSettings(true, i.ss...) | |||
| } | |||
| case *resetStream: | |||
| t.streamsQuota.add(1) | |||
There was a problem hiding this comment.
Explain a little bit about the race.
transport/transport.go
Outdated
| @@ -213,6 +213,9 @@ type Stream struct { | |||
| // the status received from the server. | |||
| statusCode codes.Code | |||
| statusDesc string | |||
| // rstStream is a flag that is true when a RST stream frame | |||
| // is sent to the server signifying that this stream is closing. | |||
There was a problem hiding this comment.
rstStream indicates whether a RSTStream needs to be sent to the server to signify that this stream is closing.
"is sent" is a bit confusing.
test/end2end_test.go
Outdated
| @@ -2671,6 +2671,45 @@ func testExceedMaxStreamsLimit(t *testing.T, e env) { | |||
| } | |||
| } | |||
|
|
|||
| const defaultMaxStreamsClient = 100 | |||
|
|
|||
| func TestClientExceedMaxStreamsLimit(t *testing.T) { | |||
There was a problem hiding this comment.
How about TestExceedDefaultMaxStreamsLimit, as opposed to the previous test TestExceedMaxStreamsLimit.
test/end2end_test.go
Outdated
| "Conn.resetTransport failed to create client transport", | ||
| "grpc: the connection is closing", | ||
| ) | ||
| te.maxStream = 0 // Server allows infinite streams. The cap should be on client side. |
There was a problem hiding this comment.
Add something saying that "the server won't send the settings frame for MaxConcurrentStreams"?
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.
…at 100 by default
fixes #1060