core: fix kill_timeout validation when progress_deadline is 0 #17342
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
lgfa29
added
backport/1.3.x
This was referenced May 29, 2023
jrasell
approved these changes
Jun 1, 2023
nomad/structs/structs.go
Outdated
| @@ -6831,12 +6831,13 @@ func (tg *TaskGroup) Validate(j *Job) error { | |||
|
|
|||
| // Validate the group's Update Strategy does not conflict with the Task's kill_timeout for service type jobs | |||
| if isTypeService && tg.Update != nil { | |||
| if task.KillTimeout > tg.Update.ProgressDeadline { | |||
| // progress_deadline = 0 has a special meaning show it should not | |||
There was a problem hiding this comment.
Suggested change
| // progress_deadline = 0 has a special meaning show it should not | |
| // progress_deadline = 0 has a special meaning, so it should not be |
This was referenced Jun 1, 2023
Merged
Merged
tgross
added a commit
that referenced
this pull request
Nov 16, 2023
The E2E test suite for rescheduling had a few bugs: * Using the command line to stop a job with a failing deployment returns a non-zero exit code, which would cause an otherwise passing test to fail. * Two of the input jobs were actually invalid but were only correctly detected as such because of #17342 This changeset also updates the whole test suite to move it off the v1 "framework". The test assertions are otherwise left untouched.
tgross
added a commit
that referenced
this pull request
Nov 16, 2023
The E2E test suite for rescheduling had a few bugs: * Using the command line to stop a job with a failing deployment returns a non-zero exit code, which would cause an otherwise passing test to fail. * Two of the input jobs were actually invalid but were only correctly detected as such because of #17342 This changeset also updates the whole test suite to move it off the v1 "framework". A few test assertions are also de-flaked. Fixes: #19076
This was referenced Nov 16, 2023
tgross
added a commit
that referenced
this pull request
Nov 16, 2023
The E2E test suite for rescheduling had a few bugs: * Using the command line to stop a job with a failing deployment returns a non-zero exit code, which would cause an otherwise passing test to fail. * Two of the input jobs were actually invalid but were only correctly detected as such because of #17342 This changeset also updates the whole test suite to move it off the v1 "framework". A few test assertions are also de-flaked. Fixes: #19076
tgross
added a commit
that referenced
this pull request
Nov 16, 2023
The E2E test suite for rescheduling had a few bugs: * Using the command line to stop a job with a failing deployment returns a non-zero exit code, which would cause an otherwise passing test to fail. * Two of the input jobs were actually invalid but were only correctly detected as such because of #17342 This changeset also updates the whole test suite to move it off the v1 "framework". A few test assertions are also de-flaked. Fixes: #19076
tgross
added a commit
that referenced
this pull request
Nov 16, 2023
The E2E test suite for rescheduling had a few bugs: * Using the command line to stop a job with a failing deployment returns a non-zero exit code, which would cause an otherwise passing test to fail. * Two of the input jobs were actually invalid but were only correctly detected as such because of #17342 This changeset also updates the whole test suite to move it off the v1 "framework". A few test assertions are also de-flaked. Fixes: #19076 Co-authored-by: Tim Gross <[email protected]>
tgross
added a commit
that referenced
this pull request
Nov 16, 2023
The E2E test suite for rescheduling had a few bugs: * Using the command line to stop a job with a failing deployment returns a non-zero exit code, which would cause an otherwise passing test to fail. * Two of the input jobs were actually invalid but were only correctly detected as such because of #17342 This changeset also updates the whole test suite to move it off the v1 "framework". A few test assertions are also de-flaked. Fixes: #19076 Co-authored-by: Tim Gross <[email protected]>
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.
Fixes the validation for
kill_timeoutwhenprogress_deadlineis set to 0, which is a special case that should not be validated.Closes #17335