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

Added JID lookup message in case minion times out. #50704

Merged
merged 3 commits into from Dec 3, 2018

Conversation

Projects
None yet
3 participants
@elisaparolo
Copy link
Contributor

elisaparolo commented Nov 30, 2018

What does this PR do?

In case a minion does not return before timeout, the job ID is printed on screen, exactly as after pressing ctrl+c (but without having to).

What issues does this PR fix or reference?

This is not a bug fix, just a small usability enhancement. It gives the Master the option to wait for a job to be completed and an easy way to look up the return data in case the minion does not return in time.

@elisaparolo elisaparolo requested a review from saltstack/team-core as a code owner Nov 30, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Nov 30, 2018

@cachedout
Copy link
Collaborator

cachedout left a comment

LGTM. Thanks for this.

@cachedout

This comment has been minimized.

Copy link
Collaborator

cachedout commented Nov 30, 2018

@elisaparolo This breaks a few tests because we no longer match on the same string. Could you fix the tests before we merge this?

@elisaparolo

This comment has been minimized.

Copy link
Contributor

elisaparolo commented Nov 30, 2018

@terminalmage

This comment has been minimized.

Copy link
Member

terminalmage commented Dec 3, 2018

I took the liberty of adding some fixing the tests to get this PR across the finish line. @elisaparolo feel free to look at what I did.

More information about our tests can be found in the docs here.

@terminalmage terminalmage merged commit 6d234b4 into saltstack:develop Dec 3, 2018

9 of 10 checks passed

codeclimate 1 issue to fix
Details
continuous-integration/jenkins/pr-merge This commit looks good
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/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@elisaparolo

This comment has been minimized.

Copy link
Contributor

elisaparolo commented Dec 4, 2018

@terminalmage I will! Thank you so much for your help!

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