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

Change service shutdown timeouts for salt-minion service (Windows) #42913

Merged
merged 2 commits into from Aug 14, 2017

Conversation

twangboy
Copy link
Contributor

@twangboy twangboy commented Aug 14, 2017

What does this PR do?

Windows default for stopping a service is 30 seconds. This changes the
default timeouts for the salt-minion service to more closely resemble
how it is handled in Windows. This gives Python a chance to cleanly exit
before being forcibly closed.

Also removes the line that wipes out the minion cache. This was added years ago when there was a problem upgrading from an old version of Salt. It no longer applies.

What issues does this PR fix or reference?

#42861 (comment)
#38590

Previous Behavior

A ctrl+c shutdown was generated and timed out after 1.5 seconds, then a WM_CLOSE was generated, followed by WM_QUIT, each with a 1.5-second timeout. Finally, the process is just terminated. Giving python about 4.5 seconds to exit cleanly.

New Behavior

Ctrl+c is issued with a 24 sec timeout, followed by WM_CLOSE with a 2-second timeout, then WM_QUIT with a 1.5-second timeout. Finally, the process is terminated. This gives Python 27.5 seconds to exit cleanly.

Tests written?

NA

Windows default for stopping a service is 30 seconds. This changes the
default timeouts for the salt-minion service to more closely resemble
how it is handled in Windows. This gives Python a chance to cleanly exit
before being forcibly closed.
@ghost
Copy link

@ghost ghost commented Aug 14, 2017

@twangboy, thanks for your PR! By analyzing the history of the files in this pull request, we identified @UtahDave and @pzbitskiy to be potential reviewers.

@rallytime rallytime merged commit a537197 into saltstack:2017.7 Aug 14, 2017
4 of 8 checks passed
@twangboy twangboy deleted the win_change_timeout branch Aug 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants