Skip to content
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

[master] Fix to scheduler for use of when and splay #56149

Merged

Conversation

garethgreenaway
Copy link
Contributor

What does this PR do?

Fix for when using a combination of when and splay. Previously comparing the wrong value when determining if the job should be run and next_fire_time updated. This resulted in multiple job runs when when and splay were used together. Code updated and test updated to ensure only one run at the specific time. Skip eval tests is dateutil.parser is unavailable.

What issues does this PR fix or reference?

#53152

Tests written?

[NOTICE] Bug fixes or features added to Salt require tests.
Please review the test documentation for details on how to implement tests into Salt's test suite.
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 garethgreenaway requested a review from a team as a code owner February 13, 2020 02:27
@ghost ghost requested a review from Ch3LL February 13, 2020 02:27
@H20-17
Copy link

H20-17 commented Feb 13, 2020

Thanks for this

@H20-17
Copy link

H20-17 commented Feb 14, 2020

Will this get backported?

…ing the wrong value when determining if the job should be run and next_fire_time updated. This resulted in multiple job runs when `when` and `splay` were used together. Code updated and test updated to ensure only one run at the specific time. Skip eval tests is dateutil.parser is unavailable.
@garethgreenaway
Copy link
Contributor Author

@H20-17 we are no longer back porting into older branches but if we end up doing a 3000.1 release then we'll try to get this fix in there.

@garethgreenaway garethgreenaway added Merge Ready v3000.1 vulnerable version labels Mar 4, 2020
@dwoz dwoz merged commit 547c73e into saltstack:master Mar 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v3000.1 vulnerable version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants