Conversation
This branch has not been deployed
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
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?
build_systemdreadmax_timeoutfrom the cluster config and passed it toLauncher.newasmax_timeout:, but the launcher's constructor acceptssite_timeout:.The unrecognized keyword was absorbed by
**_, so@site_timeoutwas alwaysnil.to_i,i.e.
0.script_timeouttreats0as "no site limit configured", so it returned'infinity'andthe site's timeout was never applied to any job.
build_systemdnow readssite_timeoutand falls back tomax_timeout, passing it underthe name the launcher actually accepts.
max_timeoutis still accepted because that is the name currently documented insystemd.rstand the one sites have in their cluster configs today. A straight renamewould have silently stopped reading their existing configuration.
Related issue
Closes #912
Testing
Four tests in
systemd_test.rb:site_timeoutreaches the launcher,max_timeoutstillworks,
site_timeoutwins when both are set, and an unset timeout is still0.The first three fail against
masterwithExpected: 5678, Actual: 0, matching the debugoutput in the issue.
Checklist
Anything else?
Worth a release note. Sites that set
max_timeouton a systemd cluster have had itsilently ignored. After this, their configured timeout starts being enforced — jobs that
previously ran without a site limit may begin hitting one. That is the intended behavior,
but it is a change those sites will notice.
Docs need a matching update in OSC/ood-documentation.
systemd.rstcurrently mentionstimeoutin prose andsite_timeoutin the example config, and neither matches the codetoday. Not changed here since it's a separate repo.
linux_hosthas the same mismatch —build_linux_hostpassesmax_timeout:to a launcherthat accepts
site_timeout:. Filed separately rather in #995 than widening this PR.