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

Fix race when SIGTERM/SIGINT received while lazyloading a module #48868

Merged
merged 1 commit into from Aug 2, 2018

Conversation

Projects
None yet
3 participants
@terminalmage
Member

terminalmage commented Aug 1, 2018

This try/except block is designed to keep some bozo from putting a
sys.exit() in their code and causing the minion to stop. The stack from
the exception is inspected, and if our signal handling ran the
sys.exit() then we re-run that sys.exit().

@terminalmage terminalmage requested a review from saltstack/team-core as a code owner Aug 1, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Aug 1, 2018

Fix race when SIGTERM/SIGINT received while lazyloading a module
This try/except block is designed to keep some bozo from putting a
sys.exit() in their code and causing the minion to stop. The stack from
the exception is inspected, and if our signal handling ran the
sys.exit() then we re-run that sys.exit().

@rallytime rallytime merged commit a567666 into saltstack:2017.7 Aug 2, 2018

6 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job 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/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@terminalmage terminalmage deleted the terminalmage:fix-loader-race branch Aug 6, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment