-
Notifications
You must be signed in to change notification settings - Fork 41
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
Improve typed socket connection robustness #810
Merged
paulgb
merged 6 commits into
main
from
paul/dis-2636-plane-sometimes-does-not-reconnect
Sep 10, 2024
Merged
Improve typed socket connection robustness #810
paulgb
merged 6 commits into
main
from
paul/dis-2636-plane-sometimes-does-not-reconnect
Sep 10, 2024
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
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
rolyatmax
reviewed
Sep 10, 2024
plane/src/typed_socket/mod.rs
Outdated
@@ -42,13 +42,13 @@ pub enum TypedSocketError { | |||
#[error("Socket closed")] | |||
Closed, | |||
#[error("Socket disconnected")] |
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.
"Socket clogged"?
rolyatmax
approved these changes
Sep 10, 2024
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.
LGTM
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.
What we know:
failed to send heartbeat
(from heartbeat.rs), with theerr
value ofDisconnected
(typed_socket).TypedSocket
,send()
uses Sender::send, whileTypedSocketSender
'ssend()
uses try_send.send
on a full channel blocks until the channel has capacity.try_send
returns immediately if the channel is full.My leading theory is that when the network is interrupted abruptly, upon reconnecting to the controller, the controller sends a bunch of messages, causing a deadlock:
new_client
loop is stalled waiting for capacity in send_to_client, which won't happen untilsocket.recv()
is called in the main drone event loopsocket.send()
when acking an actionThis PR introduces several changes, which should improve the robustness of reconnects:
socket.recv()
.TypedSocket::send
now usesSender::try_send
, for consistency withTypedSocketSender::send
. Note that as a result of moving handling out of the drone event loop, messages sent from the drone loop now useTypedSocketSender
instead ofTypedSocket
anyway, so those messages would now usetry_send
regardless.try_send
,TypedSocket::send
no longer needs to be async, so that's removed.TypedSocketError::Disconnected
is renamed toTypedSocketError::Clogged
, to better reflect what the issue is.