pull out max_parallel check to function

nomad/structs/structs.go

@@ -4008,6 +4008,30 @@ func (j *Job) IsMultiregion() bool {
 	return j.Multiregion != nil && j.Multiregion.Regions != nil && len(j.Multiregion.Regions) > 0
 }
 
+// IsMultiregionStarter returns whether a regional job should begin
+// in the running state
+func (j *Job) IsMultiregionStarter() bool {
+	if !j.IsMultiregion() {
+		return true
+	}
+	if j.Type == "system" || j.Type == "batch" {
+		return true
+	}
+	if j.Multiregion.Strategy == nil || j.Multiregion.Strategy.MaxParallel == 0 {
+		return true
+	}
+	for i, region := range j.Multiregion.Regions {
+		if j.Region == region.Name {
+			if i < j.Multiregion.Strategy.MaxParallel {
+				return true
+			} else {
+				break
+			}
+		}
+	}
+	return false
+}
+
 // VaultPolicies returns the set of Vault policies per task group, per task
 func (j *Job) VaultPolicies() map[string]map[string]*Vault {
 	policies := make(map[string]map[string]*Vault, len(j.TaskGroups))

nomad/structs/structs_test.go

@@ -5281,6 +5281,64 @@ func TestMultiregion_CopyCanonicalize(t *testing.T) {
 	require.False(old.Diff(nonEmptyOld))
 }
 
+func TestMultiregion_Starter(t *testing.T) {
+	require := require.New(t)
+
+	j := &Job{}
+	j.Type = "service"
+	j.Region = "north"
+	require.True(j.IsMultiregionStarter())
+
+	tc := &Multiregion{
+		Strategy: &MultiregionStrategy{},
+		Regions: []*MultiregionRegion{
+			{Name: "north"},
+			{Name: "south"},
+			{Name: "east"},
+			{Name: "west"},
+		},
+	}
+
+	b := &Job{}
+	b.Type = "batch"
+	b.Multiregion = tc
+	b.Region = "west"
+	require.True(j.IsMultiregionStarter())
+
+	j.Multiregion = tc
+	j.Region = "north"
+	require.True(j.IsMultiregionStarter())
+	j.Region = "south"
+	require.True(j.IsMultiregionStarter())
+	j.Region = "east"
+	require.True(j.IsMultiregionStarter())
+	j.Region = "west"
+	require.True(j.IsMultiregionStarter())
+
+	tc.Strategy = &MultiregionStrategy{MaxParallel: 1}
+	j.Multiregion = tc
+	j.Region = "north"
+	require.True(j.IsMultiregionStarter())
+	j.Region = "south"
+	require.False(j.IsMultiregionStarter())
+	j.Region = "east"
+	require.False(j.IsMultiregionStarter())
+	j.Region = "west"
+	require.False(j.IsMultiregionStarter())
+
+	tc.Strategy = &MultiregionStrategy{MaxParallel: 2}
+	j.Multiregion = tc
+	j.Region = "north"
+	require.True(j.IsMultiregionStarter())
+	j.Region = "south"
+	require.True(j.IsMultiregionStarter())
+	j.Region = "east"
+	require.False(j.IsMultiregionStarter())
+	j.Region = "west"
+	require.False(j.IsMultiregionStarter())
+
+}
+
 func TestNodeResources_Merge(t *testing.T) {
 	res := &NodeResources{
 		Cpu: NodeCpuResources{

scheduler/reconcile.go

@@ -556,10 +556,7 @@ func (a *allocReconciler) computeGroup(group string, all allocSet) bool {
 			a.deployment = structs.NewDeployment(a.job)
 			// in a multiregion job, if max_parallel is set, only the first
 			// region starts in the running state
-			if a.job.IsMultiregion() &&
-				a.job.Multiregion.Strategy != nil &&
-				a.job.Multiregion.Strategy.MaxParallel != 0 &&
-				a.job.Region != a.job.Multiregion.Regions[0].Name {
+			if !a.job.IsMultiregionStarter() {
 				a.deployment.Status = structs.DeploymentStatusPending
 				a.deployment.StatusDescription = structs.DeploymentStatusDescriptionPendingForPeer
 			}