feat: replace ssh maxTimeout with keep-alive mechanism #8062
Conversation
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
aa3744d to
8334f26
Compare
mafredri
reviewed
Jun 16, 2023
cli/agent.go
Outdated
| Default: "0", | ||
| Flag: "ssh-max-timeout", | ||
| // tcpip.KeepaliveIdleOption = 72h (forwardTCPSockOpts() in tailnet/conn.go) | ||
| Default: fmt.Sprintf("%v", 72*time.Hour-time.Minute), |
There was a problem hiding this comment.
Two thoughts:
- How about we set this to an even 72h, but do the subtraction elsewhere? I think the even number will be easier for users to understand
- Or, we could bump the tailnet conn keepalive slightly to account for this
- Perhaps the description should mention this is the maximum sensible value for this field?
There was a problem hiding this comment.
- I set it to 72h, and changed
tcpip.KeepaliveIdleOptionto 72h + 1min as it seems straightforward to me. I guess that it doesn't make any difference that we elongate the TCP timeout by 1 minute. - Done (range: 60s - 72h).
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes: #7512
Fixes: #7581
This PR enables Keep-Alive support for SSH connections instead of
MaxTimeout.The previous fix mentioned in this PR did not effectively address the issue with the VS Code extension. The problem arose when there was no activity (neither read nor write operations), causing the agent to terminate the connection after 1 minute. This pull request modifies the behavior to allow the client to respond to pings before terminating the connection, and keeping the connection alive.
How I tested this:
CODER_AGENT_SSH_MAX_TIMEOUTto 60s or modifyssh-max-timeout.Default in the source code../script/develop.shssh coder.workspace-2 -vvv<- observe pings every 20s./scripts/coder-dev.sh ssh workspace-2<- leave the terminal without activity for more than 1 minute, the shell is still alive