http2: fix request reservation when StrictMaxConcurrentStreams is enabled #1
Conversation
This file contains hidden or 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
Choraden
reviewed
Jan 8, 2025
http2/transport_test.go
Outdated
Comment on lines
5441
to
5452
| get := func() int { | ||
| req, _ := http.NewRequest("GET", ts.URL, nil) | ||
| res, err := tr.RoundTripOpt(req, opt) | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
| res.Body.Close() | ||
| return res.StatusCode | ||
| } |
There was a problem hiding this comment.
How about adding a timeout for the test to eventually fail? Right now it hangs forever.
Choraden
reviewed
Jan 8, 2025
| @@ -1800,7 +1800,7 @@ func (cc *ClientConn) awaitOpenSlotForStreamLocked(cs *clientStream) error { | |||
| return errClientConnUnusable | |||
| } | |||
| cc.lastIdle = time.Time{} | |||
| if cc.currentRequestCountLocked() < int(cc.maxConcurrentStreams) { | |||
| if int64(len(cc.streams)+cc.pendingResets) < int64(cc.maxConcurrentStreams) { | |||
There was a problem hiding this comment.
Please adjust method comment accordingly.
…bled Fix regression introduced in CL 617655. The awaitOpenSlotForStreamLocked() should not take into consideration reserved requests as they have no presence in the connection. Fixes golang/go#70809 Change-Id: Ia23968189cbdb44dae860a1de9d32700115b28b4
28c735f to
e488168
Compare
|
Updated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix regression introduced in CL 617655. The awaitOpenSlotForStreamLocked() should not take into consideration reserved requests as they have no presence in the connection.
Fixes golang/go#70809
Change-Id: Ia23968189cbdb44dae860a1de9d32700115b28b4