Repository navigation
remote: Separate handshake and resync timeouts during remote reconnection - #65457
Merged
SomeoneToIgnore merged 3 commits intoOct 14, 2026
Merged
Conversation
SomeoneToIgnore
requested changes
Oct 12, 2026
SomeoneToIgnore
left a comment
Contributor
There was a problem hiding this comment.
Please reword the release notes to be user-facing, while we're at it.
| } | ||
| } | ||
|
|
||
| pub(crate) fn reconnect( |
Contributor
There was a problem hiding this comment.
Passing a prebuilt task makes the caller responsible for building it from Arc::downgrade(self).
It also only works because cx.spawn runs the task after the new outgoing_tx is assigned.
Keeping reconnect(incoming_rx, outgoing_tx, cx) and returning the ready receiver would keep that rule inside the function.
SomeoneToIgnore
approved these changes
Oct 12, 2026
SomeoneToIgnore
left a comment
Contributor
There was a problem hiding this comment.
Thank you!
Given the time left, let's merge this after the next release, just in case.
amirkhakshour
pushed a commit
to SourceShift/zed-mini-ork
that referenced
this pull request
Oct 18, 2026
…tion (zed-industries#65457) ## Summary Remote reconnection previously reusing the heartbeat timeout (5 secs), and started the resync timeout before the new connection completed its handshake. As a result, the timeout could expire before the handshake finished. Refactored the code to introduce separate timeouts for the handshake and resync, with the resync timeout starting after the handshake completes. Also moved the tests previously located in the middle of the file to the end. ## Testing A new integration test. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [ ] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - Improved timeout handling for SSH reconnections
2 of 3 tasks
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
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.
Summary
Remote reconnection previously reusing the heartbeat timeout (5 secs), and started the resync timeout before the new connection completed its handshake. As a result, the timeout could expire before the handshake finished.
Refactored the code to introduce separate timeouts for the handshake and resync, with the resync timeout starting after the handshake completes.
Also moved the tests previously located in the middle of the file to the end.
Testing
A new integration test.
Self-review
Release Notes: