Revert PR #6558 on release/v1.16.x: fix SSH transfer regression in v1.16.0 - #6612
Merged
Merged
Conversation
… of ending the session" This reverts commit 3cee3a1. Fixes v1.16.0 regression where continuous SSH transfers larger than ~1 MiB kill the session. The replay buffer limit (proxyResumeBufferLimit = 1<<20) in proxy.go misreads in-flight data as a dead peer and exhausts the send window, ending the session prematurely. Affected: databricks ssh connect --ide (100% repro after 15-30s when VS Code server transfers several MB during startup), and any SSH tunnel transfer larger than 1 MiB in either direction. The reverted code did bundle two independent fixes (pre-swap handover resilience and SSH telemetry categories) alongside the window limit. A targeted fix-forward (degrade full window to non-resumable instead of killing session) is being prepared in parallel as the preferred path. Co-authored-by: Isaac <no-reply@databricks.com> (cherry picked from commit fb3cd79)
Co-authored-by: Isaac <no-reply@databricks.com>
Co-authored-by: Isaac <no-reply@databricks.com>
Contributor
Approval status: pending
|
Collaborator
Integration test reportCommit: a3dc849
Top 6 slowest tests (at least 2 minutes):
|
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
3 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.
Changes
Cherry-picks #6608 onto
release/v1.16.xfor the v1.16.1 patch release:experimental/ssh: survive a dropped tunnel connection instead of ending the session), reverting commit 3cee3a1, which is contained in v1.16.0..nextchanges/cli/, so v1.16.1's rendered changelog carries the entry.The revert applied to this branch with no conflicts and produces a patch identical to the one on
main.Why
v1.16.0 kills the SSH session on any continuous transfer larger than ~1 MiB. The replay buffer limit (
proxyResumeBufferLimit = 1<<20) inproxy.gomisreads in-flight data as a dead peer and exhausts the send window, ending the session prematurely.Affected:
databricks ssh connect --ide(100% repro after 15-30s, when the VS Code server transfers several MB during startup), and any SSH tunnel transfer larger than 1 MiB in either direction.The reverted change bundled two independent fixes (pre-swap handover resilience and SSH telemetry categories) alongside the window limit. A targeted fix-forward on
main(degrade a full window to non-resumable instead of killing the session) is the preferred long-term path; this patch-release branch takes the revert.Tests
go build ./...go test ./experimental/ssh/... ./libs/telemetry/...— passgo test ./acceptance -run 'TestAccept/ssh'— passtools/validate_nextchanges.py— passThis pull request and its description were written by Isaac.