-
-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix WebSocket server heartbeat timeout logic #8546
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #8546 +/- ##
==========================================
+ Coverage 97.68% 97.70% +0.01%
==========================================
Files 107 107
Lines 33403 33425 +22
Branches 3923 3926 +3
==========================================
+ Hits 32631 32659 +28
+ Misses 559 555 -4
+ Partials 213 211 -2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
b18726a
to
265e01d
Compare
Make sure to unblock the `receive` operation by feeding the receiver an error in a `WSMessage` Change `TimeoutError` to `ServerTimeoutError` to accurately represent failure (this is backwards compatible since `ServerTimeoutError` has `TimeoutError` in the MRO) fixes aio-libs#8540
265e01d
to
7875c9c
Compare
preview is here https://aiohttp--8546.org.readthedocs.build/en/8546/changes.html |
I want to do some more manual testing with this before merging |
testing seems ok |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @arcivanov
Backport to 3.10: 💔 cherry-picking failed — conflicts found❌ Failed to cleanly apply 4140b0e on top of patchback/backports/3.10/4140b0eda3658a3f6bd5a9479553aae4a0c14bb8/pr-8546 Backporting merged PR #8546 into master
🤖 @patchback |
Co-authored-by: J. Nick Koston <nick@koston.org> (cherry picked from commit 4140b0e)
Backport to 3.11: 💔 cherry-picking failed — conflicts found❌ Failed to cleanly apply 4140b0e on top of patchback/backports/3.11/4140b0eda3658a3f6bd5a9479553aae4a0c14bb8/pr-8546 Backporting merged PR #8546 into master
🤖 @patchback |
Co-authored-by: J. Nick Koston <nick@koston.org> (cherry picked from commit 4140b0e)
…eout logic (#8573) Co-authored-by: J. Nick Koston <nick@koston.org> Co-authored-by: Arcadiy Ivanov <arcadiy@ivanov.biz>
Make sure to unblock the
receive
operation by feeding the receiver an error in aWSMessage
Change
TimeoutError
toServerTimeoutError
to accurately represent failure (this is backwards compatible sinceServerTimeoutError
hasTimeoutError
in the MRO)fixes #8540
Checklist
CONTRIBUTORS.txt
CHANGES/
folder