[develop] global splay for scheduler#46525
Merged
rallytime merged 2 commits intosaltstack:developfrom Apr 5, 2018
Merged
Conversation
garethgreenaway
force-pushed
the
46462_global_splay
branch
from
940e86c to
4bec572
Compare
Contributor
|
@garethgreenaway There's a conflicting file on this one now. Can you fix that up? |
…r. Useful for setting splay to internal jobs. Also adding additional integration tests to test global splay as well as per job splay options.
garethgreenaway
force-pushed
the
46462_global_splay
branch
from
b04ab53 to
a82fa7a
Compare
s0undt3ch
approved these changes
Apr 5, 2018
| self.enabled = schedule['enabled'] | ||
| if 'splay' in schedule: | ||
| self.splay = schedule['splay'] | ||
|
|
Contributor
There was a problem hiding this comment.
Won't this override your global set value at init time?
Contributor
There was a problem hiding this comment.
Oh. You're not passing it as a class init argument.
Contributor
|
re-run all |
Contributor
|
re-run py |
Contributor
|
@rallytime This should be ready once tests run. |
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
4 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?
Adding the ability to set a global splay for all jobs in the scheduler. Useful for setting splay to internal jobs. Also adding additional integration tests to test global splay as well as per job splay options.
What issues does this PR fix or reference?
#46462
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.