luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

multiregion validation fixes (#8265) 

Multi-region jobs need to bypass validating counts otherwise we get spurious
warnings in Job.Plan.
This commit is contained in:
Tim Gross 2020-06-24 12:18:51 -04:00 committed by GitHub
parent 96ba670f7d
commit a449009e9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command/agent/job_endpoint.go
View File

@ -145,6 +145,13 @@ func (s *HTTPServer) jobPlan(resp http.ResponseWriter, req *http.Request,
return nil, CodedError(400, "Job ID does not match")
}
if args.Job.Multiregion != nil && args.Job.Region != nil {
region := *args.Job.Region
if !(region == "global" || region == "") {
return nil, CodedError(400, "Job can't have both multiregion and region blocks")
}
}
var region *string
// Region in http request query param takes precedence over region in job hcl config

8
nomad/structs/structs.go
View File

@ -5775,7 +5775,7 @@ func (tg *TaskGroup) Validate(j *Job) error {
}
// Validate the scaling policy
if err := tg.validateScalingPolicy(); err != nil {
if err := tg.validateScalingPolicy(j); err != nil {
outer := fmt.Errorf("Task group scaling policy validation failed: %v", err)
mErr.Errors = append(mErr.Errors, outer)
}
@ -5916,7 +5916,7 @@ func (tg *TaskGroup) validateServices() error {
// validateScalingPolicy ensures that the scaling policy has consistent
// min and max, not in conflict with the task group count
func (tg *TaskGroup) validateScalingPolicy() error {
func (tg *TaskGroup) validateScalingPolicy(j *Job) error {
if tg.Scaling == nil {
return nil
}
@ -5928,7 +5928,7 @@ func (tg *TaskGroup) validateScalingPolicy() error {
fmt.Errorf("Scaling policy invalid: maximum count must not be less than minimum count"))
}
if int64(tg.Count) < tg.Scaling.Min {
if int64(tg.Count) < tg.Scaling.Min && !(j.IsMultiregion() && tg.Count == 0) {
mErr.Errors = append(mErr.Errors,
fmt.Errorf("Scaling policy invalid: task group count must not be less than minimum count in scaling policy"))
}
@ -5949,7 +5949,7 @@ func (tg *TaskGroup) Warnings(j *Job) error {
// Validate the update strategy
if u := tg.Update; u != nil {
// Check the counts are appropriate
if u.MaxParallel > tg.Count {
if u.MaxParallel > tg.Count && !(j.IsMultiregion() && tg.Count == 0) {
mErr.Errors = append(mErr.Errors,
fmt.Errorf("Update max parallel count is greater than task group count (%d > %d). "+
"A destructive change would result in the simultaneous replacement of all allocations.", u.MaxParallel, tg.Count))