Fix the websocket shutdown behavior #483
Merged
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
sbSteveK
approved these changes
Aug 15, 2024
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #483 +/- ##
==========================================
+ Coverage 79.55% 79.61% +0.06%
==========================================
Files 27 27
Lines 11688 11683 -5
==========================================
+ Hits 9298 9302 +4
+ Misses 2390 2381 -9 ☔ View full report in Codecov by Sentry. |
graebm
reviewed
Aug 16, 2024
Comment on lines
-992
to
-993
| websocket->thread_data.is_reading_stopped = true; | ||
| websocket->thread_data.is_writing_stopped = true; |
Contributor
There was a problem hiding this comment.
Oh man, I totally didn't notice these changes in that other PR.
I'll take over this PR. I'm oncall
…, vs calls from off-thread caused directly by the user
TingDaoK
commented
Aug 16, 2024
Contributor
Author
TingDaoK
left a comment
TingDaoK
left a comment
There was a problem hiding this comment.
Cannot approve, but 
graebm
approved these changes
Aug 16, 2024
graebm
added a commit
to awslabs/aws-crt-java
that referenced
this pull request
Aug 16, 2024
Update submodules, bringing in this fix: awslabs/aws-c-http#483 ``` aws-c-common v0.9.26 -> v0.9.27 aws-c-event-stream v0.4.2 -> v0.4.3 aws-c-http v0.8.7 -> v0.8.8 ```
graebm
added a commit
to awslabs/aws-crt-cpp
that referenced
this pull request
Aug 16, 2024
Update submodules, bringing in this fix: awslabs/aws-c-http#483 ``` aws-c-common v0.9.26 -> v0.9.27 aws-c-event-stream v0.4.2 -> v0.4.3 aws-c-http v0.8.7 -> v0.8.8 ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
The bug was introduced in PR #474
is_writing_stopped = trueshouldn't be set directly, there's a helper functions_stop_writing()that ensures subsequent calls toaws_websocket_send_frame()will fail.Let's take a whole new approach these channel-shutdown-window-deadlock issues:
s_stop_reading_and_dont_block_shutdown()function that setsis_reading_stopped = true, but also increments the read window so that channel shutdown won't deadlock.is_reading_stopped = truenow use this helper insteadaws_channel_shutdown()is called. Lots of channel behavior has changed since this websocket code was written.aws_channel_shutdown()s_schedule_channel_shutdown_from_offthead()aws_websocket_close(), or when the refcount goes to zero, we can assume the user is OK if reading stops, and it can calls_stop_reading_and_dont_block_shutdown()on the way to shutting down.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.