fix: increase SSH connection timeout from 5s to 15s for child nodes#12274
Open
jakub961241 wants to merge 1 commit into1Panel-dev:dev-v2from
Open
fix: increase SSH connection timeout from 5s to 15s for child nodes#12274jakub961241 wants to merge 1 commit into1Panel-dev:dev-v2from
jakub961241 wants to merge 1 commit into1Panel-dev:dev-v2from
Conversation
When connecting to child nodes with poor network connectivity (e.g., domestic to international servers), the 5-second SSH timeout was too short, causing "ssh: handshake failed: i/o timeout" errors. Changes: - Increase default DialTimeOut from 5s to 15s (both core and agent) - Double the handshake deadline (config.Timeout * 2) to allow more time for the SSH handshake after TCP connection is established Fixes 1Panel-dev#11621
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
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
Fixes #11621 - Child node SSH connection fails with "ssh: handshake failed: i/o timeout" when network latency is high (e.g., domestic China to overseas servers).
Root Cause
Default
DialTimeOutwas hardcoded to 5 seconds atcore/utils/ssh/ssh.go:51andagent/utils/ssh/ssh.go:43. For cross-border connections with several seconds of latency, this wasn't enough for both TCP dial + SSH handshake.Additionally,
DialWithTimeoutset the handshake deadline equal to the dial timeout (conn.SetDeadline(time.Now().Add(config.Timeout))), which meant the SSH handshake had to complete in the same window as the dial.Fix
DialTimeOutfrom 5s to 15s (both core and agent)config.Timeout * 2) to give more time for the SSH key exchange after TCP connectionChanged files
core/utils/ssh/ssh.go- Default timeout 5s → 15s, handshake deadline × 2agent/utils/ssh/ssh.go- Default timeout 5s → 15s