Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add random sleep time to avoid overloading Windows #51171

Merged
merged 1 commit into from Jan 15, 2019

Conversation

Projects
None yet
3 participants
@twangboy
Copy link
Contributor

commented Jan 14, 2019

What does this PR do?

Fixes an issue on Windows where the salt-minion restarts over and over when the key has been denied on the master. This adds a random delay between 10 and 20 seconds before the minion exits.

What issues does this PR fix or reference?

#51138

Tests written?

No

Commits signed with GPG?

Yes

@dwoz

dwoz approved these changes Jan 14, 2019

@dwoz dwoz merged commit 1206f92 into saltstack:2018.3 Jan 15, 2019

10 checks passed

WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details

@twangboy twangboy deleted the twangboy:fix_crypt branch Jan 16, 2019

@damon-atkins

This comment has been minimized.

Copy link
Member

commented Jan 17, 2019

A better solution on windows is to adjust the service, rather than effect all platforms.

nssm/ssm.exe set salt-minion AppThrottle 6000  # Exits within 60 sec,  as python a bit slow to start up
nssm/ssm.exe set salt-minion AppExit Default Restart  # already the default.
nssm/ssm.exe set salt-minion AppRestartDelay 30000  # Then delay restart by 5 min, service will indicate paused
@damon-atkins

This comment has been minimized.

Copy link
Member

commented Jan 17, 2019

@damon-atkins

This comment has been minimized.

Copy link
Member

commented Jan 17, 2019

Sorry must of missed the notification for this discussion #51138

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.