Disable ControlPersist for sshfs connections on Windows #3376
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
AkihiroSuda
reviewed
Apr 7, 2025
| @@ -68,6 +68,9 @@ func (a *HostAgent) setupMount(m limayaml.Mount) (*mount, error) { | |||
| Readonly: !(*m.Writable), | |||
| SSHFSAdditionalArgs: []string{"-o", sshfsOptions}, | |||
| } | |||
| if runtime.GOOS == "windows" { | |||
There was a problem hiding this comment.
Could you add a code comment to the explain the reason
There was a problem hiding this comment.
Description added in code and in the commit message.
Lima recommended OpenSSH distribution on Windows platform has limited fucntionality over mux socket. Most notably it can't pass FDs over socket. This results in error messages and internal fallbacks, but also had higher failure rate during testing. It is reasonable to disable this for sftp-server communications on Windows to improve stability. Signed-off-by: Arthur Sengileyev <[email protected]>
arixmkii
force-pushed
the
disable-persist-sshfs
branch
from
f57b1a0 to
24dfa16
Compare
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.
This dramatically improves stability for sshfs on Windows. It allowed all integration tests to pass in GH actions CI.
I can't state that it doesn't work at all with it enabled - I had some rare successful runs on local machine (never reproduced in GH actions). It also impossible to fully disable mux in other SSH calls of Lima as it will break SSH port forwarder (so, this part definitely works with comms via Unix socket).
Test run is provided in https://github.com/arixmkii/qcw/actions/runs/14022522017/job/39256363831