quic: fix connection close error when blocked socket gets unblocked #36238
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
Signed-off-by: Dan Zhang <[email protected]>
|
/retest |
|
/assign @abeyad |
|
/retest |
abeyad
reviewed
Sep 20, 2024
| @@ -242,7 +242,7 @@ void EnvoyQuicClientConnection::onFileEvent(uint32_t events, | |||
| ASSERT(events & (Event::FileReadyType::Read | Event::FileReadyType::Write)); | |||
|
|
|||
| if (events & Event::FileReadyType::Write) { | |||
| OnCanWrite(); | |||
| OnBlockedWriterCanWrite(); | |||
There was a problem hiding this comment.
does this call still work if the writer is not blocked?
There was a problem hiding this comment.
oh nevermind, I see that it unblocks the writer before calling OnCanWrite()
There was a problem hiding this comment.
Yes, and writer_->SetWritable() is a no-op on unblocked writer:
|
/assign @RyanTheOptimist |
abeyad
approved these changes
Sep 20, 2024
zuercher
approved these changes
Sep 20, 2024
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.
Commit Message: today the connection will be closed with QUIC_INTERNAL_ERROR because of https://github.com/google/quiche/blob/4249f8025caed1e3d71d04d9cadf42251acb7cac/quiche/quic/core/quic_connection.cc#L2703 if the socket becomes write blocked and then unblocked. This change fixes it by calling OnBlockedWriterCanWrite() instead which set the writer to be unblocked before OnCanWrite().
Additional Message: also refined some comments in the same file.
Risk Level: low, fix existing issue
Testing: added unit tests
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A