Return active running jobs on the master#52241
Closed
austinpapp wants to merge 11 commits intosaltstack:developfrom
Closed
Return active running jobs on the master#52241austinpapp wants to merge 11 commits intosaltstack:developfrom
austinpapp wants to merge 11 commits intosaltstack:developfrom
Conversation
* salt/runner.py::_run_runner was always returning {retcode: 70}. removed the else logic
* fixed some tests
twangboy
approved these changes
Mar 20, 2019
Contributor
|
I have a similar PR here: #52158 |
Contributor
|
@austinpapp Some test trouble here I'm afraid. |
Contributor
Author
|
@cachedout yea. Will fix when I have a few free cycles. |
cachedout
reviewed
Mar 26, 2019
| salt-run jobs.master | ||
| ''' | ||
| jobs = salt.utils.master.get_running_jobs(__opts__) | ||
| return jobs |
Contributor
There was a problem hiding this comment.
Nitpick: collapse into one line. :)
Contributor
Author
There was a problem hiding this comment.
meh. but because its mike, i'll do it for you :D
Contributor
Author
|
these tests 🤦♂️ ... |
cachedout
approved these changes
Apr 9, 2019
ghost
requested a review
from
Merged
Contributor
|
I ported this PR to the master branch here: #56440 We have changed to using the master branch instead of develop going forward. You can see further details about this change here: saltstack/salt-enhancement-proposals#20 |
s0undt3ch
added a commit
to s0undt3ch/salt
that referenced
this pull request
May 14, 2020
This change was merged into master in saltstack#56440 which was a port to master effort from saltstack#52241 Fixes saltstack#57278
9 tasks
3 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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?
Return all active jobs running on a master. This is follow up work to #51629
Secondary updates:
salt/runner.py::_run_runnerwas always returning{retcode: 70}. removed theelselogic. This logic was merged in here Bugfix: manage.down crash #48447Tests written?
Yes
Commits signed with GPG?
Yes/No
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.