Add systemd_randomizeddelaysec #585
Merged
Conversation
This file contains 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
Allow configuration of the RandomizedDelaySec parameter of the systemd timer, which allows randomizing Puppet runs in a way that lets the administrator see exact moment of the next Puppet run. There's no incompatibility between Puppet's internal splay and this, but both probably shouldn't be used together.
|
@jcharaoui this is marked as WIP:. Does that mean it's not ready for review? |
|
The functionality is ready for review. I marked it WIP because I didn't write a test case for it. Should be pretty simple but unfortunately I'm unfamiliar with puppet module tests. |
ekohl
requested changes
Mar 12, 2018
manifests/init.pp
Outdated
| @@ -581,6 +584,7 @@ | |||
| Array[Enum['cron', 'service', 'systemd.timer', 'none']] $unavailable_runmodes = $puppet::params::unavailable_runmodes, | |||
| Optional[String] $cron_cmd = $puppet::params::cron_cmd, | |||
| Optional[String] $systemd_cmd = $puppet::params::systemd_cmd, | |||
| Optional[Integer[0]] $systemd_randomizeddelaysec = $puppet::params::systemd_randomizeddelaysec, | |||
There was a problem hiding this comment.
Since the default is 0 and the code doesn't handle undef different from an integer I think this is not optional.
manifests/init.pp
Outdated
| @@ -113,6 +113,9 @@ | |||
| # $systemd_cmd:: Specify command to launch when runmode is | |||
| # set 'systemd.timer'. | |||
| # | |||
| # $systemd_randomizeddelaysec:: Adds a random delay between 0 and this value | |||
| # (in seconds) to the timer. | |||
There was a problem hiding this comment.
This could use a note that it's only relevant when runmode is systemd.timer.
Undef isn't handled, and 0 is default anyways
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
ekohl
reviewed
Mar 12, 2018
| @@ -68,6 +68,9 @@ | |||
| should contain_file('/etc/systemd/system/puppet-run.timer'). | |||
| with_content(/.*OnCalendar\=\*-\*-\* \*\:10,40:00.*/) | |||
|
|
|||
| should contain_file('/etc/systemd/system/puppet-run.timer'). | |||
| with_content(/.*RandomizedDelaySec\=0.*/) | |||
There was a problem hiding this comment.
I think this can even be /^RandomizedDelaySec\=0$/ since it checks lines. Not sure though.
ekohl
approved these changes
Mar 12, 2018
|
merged, merci @jcharaoui! |
ekohl
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Allow configuration of the RandomizedDelaySec parameter of the systemd
timer, which allows randomizing Puppet runs in a way that lets the
administrator see exact moment of the next Puppet run. There's no
incompatibility between Puppet's internal splay and this, but both
probably shouldn't be used together.
This probably still needs adjustments to existing tests.