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

Clean up minion shutdown #29599

Merged
merged 5 commits into from Dec 15, 2015

Conversation

Projects
None yet
3 participants
@cachedout
Contributor

cachedout commented Dec 10, 2015

Also cleaner logging for cases where the master could not be contacted.

cachedout added some commits Dec 10, 2015

Clean up minion shutdown
Also cleaner logging for cases where the master could not be contacted.
Additional fixes.
Better detection of schedule init, handle failed beacons and remove unnedeed debug statements.
self._fire_master('ping', 'minion_ping')
try:
self._fire_master('ping', 'minion_ping')
except Exception:

This comment has been minimized.

@basepi

basepi Dec 10, 2015

Collaborator

We should log the exception, since we're catching all Exceptions here. Otherwise it's hard to figure out why it failed.

@basepi

basepi Dec 10, 2015

Collaborator

We should log the exception, since we're catching all Exceptions here. Otherwise it's hard to figure out why it failed.

This comment has been minimized.

@s0undt3ch

s0undt3ch Dec 11, 2015

Member

Perhaps just add exc_on_loglevel=logging.DEBUG ?

@s0undt3ch

s0undt3ch Dec 11, 2015

Member

Perhaps just add exc_on_loglevel=logging.DEBUG ?

This comment has been minimized.

@cachedout

cachedout Dec 11, 2015

Contributor

Sounds good. Will change. Thanks to both of you.

@cachedout

cachedout Dec 11, 2015

Contributor

Sounds good. Will change. Thanks to both of you.

@s0undt3ch

This comment has been minimized.

Show comment
Hide comment
@s0undt3ch

s0undt3ch Dec 11, 2015

Member

Why are you catching keyboard interrupts? The signal handling code handles it, was there really a need for it?

It might just be a matter of calling destroy on the signal handling function?

Member

s0undt3ch commented Dec 11, 2015

Why are you catching keyboard interrupts? The signal handling code handles it, was there really a need for it?

It might just be a matter of calling destroy on the signal handling function?

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Dec 11, 2015

Contributor

@s0undt3ch For whatever reason, that signal handling wasn't being respected by Tornado and I found that catching the KeyboardInterrupt here was necessary to avoid stacktracing.

Contributor

cachedout commented Dec 11, 2015

@s0undt3ch For whatever reason, that signal handling wasn't being respected by Tornado and I found that catching the KeyboardInterrupt here was necessary to avoid stacktracing.

@s0undt3ch

This comment has been minimized.

Show comment
Hide comment
@s0undt3ch

s0undt3ch Dec 11, 2015

Member

How can I trigger your stacktrace? Simply by running the minion and trying to stop it with CTRL-C ?

Member

s0undt3ch commented Dec 11, 2015

How can I trigger your stacktrace? Simply by running the minion and trying to stop it with CTRL-C ?

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Dec 11, 2015

Contributor

Start a minion and point it to a master which is not up. While it is trying to connect, ctrl-c.

Contributor

cachedout commented Dec 11, 2015

Start a minion and point it to a master which is not up. While it is trying to connect, ctrl-c.

@s0undt3ch

This comment has been minimized.

Show comment
Hide comment
@s0undt3ch

s0undt3ch Dec 11, 2015

Member

Cool, I'll try that...

Member

s0undt3ch commented Dec 11, 2015

Cool, I'll try that...

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Dec 14, 2015

Contributor

@s0undt3ch Were you able to reproduce this?

Contributor

cachedout commented Dec 14, 2015

@s0undt3ch Were you able to reproduce this?

@s0undt3ch

This comment has been minimized.

Show comment
Hide comment
@s0undt3ch

s0undt3ch Dec 14, 2015

Member

Didn't had time to go over this, sorry...

Member

s0undt3ch commented Dec 14, 2015

Didn't had time to go over this, sorry...

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Dec 14, 2015

Contributor

@s0undt3ch No problem. Do you oppose this going in or would you prefer to wait?

Contributor

cachedout commented Dec 14, 2015

@s0undt3ch No problem. Do you oppose this going in or would you prefer to wait?

@s0undt3ch

This comment has been minimized.

Show comment
Hide comment
@s0undt3ch

s0undt3ch Dec 15, 2015

Member

No, no! Fire away!

Member

s0undt3ch commented Dec 15, 2015

No, no! Fire away!

cachedout added a commit that referenced this pull request Dec 15, 2015

@cachedout cachedout merged commit bd91839 into saltstack:2015.8 Dec 15, 2015

4 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11968 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #3033 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11673 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10540 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment