-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Fix service.check_restart stanza propagation #3718
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
304a037
Fix service.check_restart stanza propagation
schmichael 566abcb
Move changelog entry from bug fix to feature
schmichael 9b9a4af
Invert and test CheckRestart merge logic
schmichael 756305f
Revert "Missed header mention of server.check_restart"
schmichael b658ac3
Revert "Remove mention of check_restart on service"
schmichael File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ package api | |
import ( | ||
"reflect" | ||
"testing" | ||
"time" | ||
|
||
"github.com/hashicorp/nomad/helper" | ||
"github.com/stretchr/testify/assert" | ||
|
@@ -266,3 +267,51 @@ func TestTaskGroup_Canonicalize_Update(t *testing.T) { | |
tg.Canonicalize(job) | ||
assert.Nil(t, tg.Update) | ||
} | ||
|
||
// TestService_CheckRestart asserts Service.CheckRestart settings are properly | ||
// inherited by Checks. | ||
func TestService_CheckRestart(t *testing.T) { | ||
job := &Job{Name: helper.StringToPtr("job")} | ||
tg := &TaskGroup{Name: helper.StringToPtr("group")} | ||
task := &Task{Name: "task"} | ||
service := &Service{ | ||
CheckRestart: &CheckRestart{ | ||
Limit: 11, | ||
Grace: helper.TimeToPtr(11 * time.Second), | ||
IgnoreWarnings: true, | ||
}, | ||
Checks: []ServiceCheck{ | ||
{ | ||
Name: "all-set", | ||
CheckRestart: &CheckRestart{ | ||
Limit: 22, | ||
Grace: helper.TimeToPtr(22 * time.Second), | ||
IgnoreWarnings: true, | ||
}, | ||
}, | ||
{ | ||
Name: "some-set", | ||
CheckRestart: &CheckRestart{ | ||
Limit: 33, | ||
Grace: helper.TimeToPtr(33 * time.Second), | ||
}, | ||
}, | ||
{ | ||
Name: "unset", | ||
}, | ||
}, | ||
} | ||
|
||
service.Canonicalize(task, tg, job) | ||
assert.Equal(t, service.Checks[0].CheckRestart.Limit, 22) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use "require" package There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In this case I want it to continue checking in case it's just one field off. |
||
assert.Equal(t, *service.Checks[0].CheckRestart.Grace, 22*time.Second) | ||
assert.True(t, service.Checks[0].CheckRestart.IgnoreWarnings) | ||
|
||
assert.Equal(t, service.Checks[1].CheckRestart.Limit, 33) | ||
assert.Equal(t, *service.Checks[1].CheckRestart.Grace, 33*time.Second) | ||
assert.True(t, service.Checks[1].CheckRestart.IgnoreWarnings) | ||
|
||
assert.Equal(t, service.Checks[2].CheckRestart.Limit, 11) | ||
assert.Equal(t, *service.Checks[2].CheckRestart.Grace, 11*time.Second) | ||
assert.True(t, service.Checks[2].CheckRestart.IgnoreWarnings) | ||
} |
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
job "service_check_restart" { | ||
type = "service" | ||
group "group" { | ||
task "task" { | ||
service { | ||
name = "http-service" | ||
check_restart { | ||
limit = 3 | ||
grace = "10s" | ||
ignore_warnings = true | ||
} | ||
check { | ||
name = "random-check" | ||
type = "tcp" | ||
port = "9001" | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This merge seems backwards. Usually we prefer the passed in object's values. https://github.com/hashicorp/nomad/blob/master/api/jobs.go#L389