Gracefully shutdown worker threads #47279
Merged
Conversation
This file contains 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
ghost
self-requested a review
DmitryKuzmenko
approved these changes
Apr 24, 2018
gtmanfred
approved these changes
Apr 24, 2018
dwoz
force-pushed
the
py3_build_fix
branch
2 times, most recently
from
2327859
to
b0f3627
Compare
Since close can be called more than once handle and log exceptions
rallytime
reviewed
Apr 25, 2018
salt/transport/tcp.py
Outdated
| try: | ||
| self.req_server.stop() | ||
| except Exception as exc: | ||
| log.debug("TCPReqServerChannel close generated an exception: %s" str(exc)) |
There was a problem hiding this comment.
This has a syntax error: there is a missing comma after %s".
|
re-run py |
cachedout
approved these changes
Apr 25, 2018
| try: | ||
| self.req_server.stop() | ||
| except Exception as exc: | ||
| log.debug("TCPReqServerChannel close generated an exception: %s", str(exc)) |
There was a problem hiding this comment.
I think log.exception would be better here.
There was a problem hiding this comment.
I think I can get rid of that completely by checking is_alive in the stop method. If not, I'll change this to log exception.
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.
What does this PR do?
Gracefully shutdown worker threads when TCPReqServerChannel is closed or destroyed.
Previous Behavior
Running thread causes processes not to terminate.
New Behavior
Threads will stop gracefully and processes will terminate as they should. This fixes the windows python 3 Jenkins build.
Tests written?
No - Fixes test suite
Commits signed with GPG?
No