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

[2018.3] state runner pause resume kill #47915

Merged
merged 2 commits into from Jun 7, 2018

Conversation

Projects
None yet
3 participants
@garethgreenaway
Member

garethgreenaway commented May 31, 2018

What does this PR do?

Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality.

What issues does this PR fix or reference?

saltstack/raas#3036

Tests written?

Yes

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@garethgreenaway

This comment has been minimized.

Member

garethgreenaway commented Jun 1, 2018

re-run py3

@rallytime

Neat!

@rallytime rallytime requested a review from cachedout Jun 1, 2018

@garethgreenaway

This comment has been minimized.

Member

garethgreenaway commented Jun 3, 2018

re-run centos

garethgreenaway added some commits May 31, 2018

Some fixes to the set_pause and rm_pause function in the state runner…
…, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality.

@garethgreenaway garethgreenaway force-pushed the garethgreenaway:state_runner_pause_resume_kill branch from ae3cec1 to 2ecbe9c Jun 6, 2018

@garethgreenaway

This comment has been minimized.

Member

garethgreenaway commented Jun 7, 2018

re-run centos

@@ -15,22 +15,38 @@
LOGGER = logging.getLogger(__name__)
def set_pause(jid, state_id, duration=None):
def pause(jid, state_id=None, duration=None):

This comment has been minimized.

@cachedout

cachedout Jun 7, 2018

Contributor

Why are we changing function names in a dot release?

This comment has been minimized.

@cachedout

cachedout Jun 7, 2018

Contributor

I didn't see that this was aliased. This is fine.

@cachedout cachedout merged commit ea85f88 into saltstack:2018.3 Jun 7, 2018

6 of 9 checks passed

jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19617 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5562 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25760 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17820 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23487 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10527 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22451 — SUCCESS
Details

rallytime added a commit that referenced this pull request Jun 14, 2018

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