[master] Enable "KeepAlive" probes for Salt SSH executions#65488
Merged
dwoz merged 5 commits intoJan 28, 2026
Merged
Conversation
salt-project-bot-prod-environment
Bot
changed the title
3 tasks
Contributor
|
I'm excited to see this PR! - I'm in an environment where setting/tuning keep-alive would be very beneficial. |
meaksh
force-pushed
the
master-enable-keepalive-on-salt-ssh-connection
branch
from
632e23e to
dd19465
Compare
agraul
pushed a commit
to agraul/salt
that referenced
this pull request
Jan 27, 2025
…stack#610) * Enable KeepAlive probes for Salt SSH connections (bsc#1211649) * Add tests for Salt SSH keepalive options * Add changelog file * Make changes suggested by pre-commit BACKPORT-UPSTREAM=saltstack#65488
twangboy
approved these changes
Apr 4, 2025
twangboy
force-pushed
the
master-enable-keepalive-on-salt-ssh-connection
branch
from
4823a10 to
041e584
Compare
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
4 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.
What does this PR do?
This PR enables "KeepAlive" probes the SSH connections created by Salt SSH, in order to be more reliable when there are problems in the network or ssh stuck connections, preventing "salt-ssh" process from getting stuck (or even worse, "salt-api" threads getting stuck).
Previous Behavior
No
ServerAliveIntervalorServerAliveCountMaxoptions were passed to the "ssh" command.New Behavior
The KeepAlive proves (ServerAliveInterval) is now enabled by default for Salt SSH executions. This behavior can be disabled via configuration value / roster or CLI argument.
The following new configuration values were added to the Salt Master.
ssh_keepalive(default: True)ssh_keepalive_interval(default: 60)ssh_keepalive_count_max(default: 3)These new configuration values can be set via master configuration or passed to
salt-sshCLI.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes