Merge pull request #3081 from clinta/maxparallel0

If MaxParallel == 0 default limit to count
hashicorp · Aug 28, 2017 · 659d099 · 659d099
2 parents 472a1f7 + 8486bf2
commit 659d099
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/api/jobs.go b/api/jobs.go
@@ -372,12 +372,12 @@ func (u *UpdateStrategy) Merge(o *UpdateStrategy) {
 }
 
 func (u *UpdateStrategy) Canonicalize() {
+	d := structs.DefaultUpdateStrategy
+
 	if u.MaxParallel == nil {
-		u.MaxParallel = helper.IntToPtr(0)
+		u.MaxParallel = helper.IntToPtr(d.MaxParallel)
 	}
 
-	d := structs.DefaultUpdateStrategy
-
 	if u.Stagger == nil {
 		u.Stagger = helper.TimeToPtr(d.Stagger)
 	}

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -2012,7 +2012,7 @@ var (
 	// jobs with the old policy or for populating field defaults.
 	DefaultUpdateStrategy = &UpdateStrategy{
 		Stagger:         30 * time.Second,
-		MaxParallel:     0,
+		MaxParallel:     1,
 		HealthCheck:     UpdateStrategyHealthCheck_Checks,
 		MinHealthyTime:  10 * time.Second,
 		HealthyDeadline: 5 * time.Minute,
@@ -2076,8 +2076,8 @@ func (u *UpdateStrategy) Validate() error {
 		multierror.Append(&mErr, fmt.Errorf("Invalid health check given: %q", u.HealthCheck))
 	}
 
-	if u.MaxParallel < 0 {
-		multierror.Append(&mErr, fmt.Errorf("Max parallel can not be less than zero: %d < 0", u.MaxParallel))
+	if u.MaxParallel < 1 {
+		multierror.Append(&mErr, fmt.Errorf("Max parallel can not be less than one: %d < 1", u.MaxParallel))
 	}
 	if u.Canary < 0 {
 		multierror.Append(&mErr, fmt.Errorf("Canary count can not be less than zero: %d < 0", u.Canary))

diff --git a/nomad/structs/structs_test.go b/nomad/structs/structs_test.go
@@ -1393,7 +1393,7 @@ func TestConstraint_Validate(t *testing.T) {
 
 func TestUpdateStrategy_Validate(t *testing.T) {
 	u := &UpdateStrategy{
-		MaxParallel:     -1,
+		MaxParallel:     0,
 		HealthCheck:     "foo",
 		MinHealthyTime:  -10,
 		HealthyDeadline: -15,
@@ -1406,7 +1406,7 @@ func TestUpdateStrategy_Validate(t *testing.T) {
 	if !strings.Contains(mErr.Errors[0].Error(), "Invalid health check given") {
 		t.Fatalf("err: %s", err)
 	}
-	if !strings.Contains(mErr.Errors[1].Error(), "Max parallel can not be less than zero") {
+	if !strings.Contains(mErr.Errors[1].Error(), "Max parallel can not be less than one") {
 		t.Fatalf("err: %s", err)
 	}
 	if !strings.Contains(mErr.Errors[2].Error(), "Canary count can not be less than zero") {