Scheduler should detect change in replicas for multiple component workloads

Signed-off-by: mszacillo <[email protected]>

Author: mszacillo

pkg/util/binding.go

@@ -38,21 +38,41 @@ func IsBindingReplicasChanged(bindingSpec *workv1alpha2.ResourceBindingSpec, str
 	if strategy == nil {
 		return false
 	}
+
+	bindingReplicas := GetTotalBindingReplicas(bindingSpec)
+
 	if strategy.ReplicaSchedulingType == policyv1alpha1.ReplicaSchedulingTypeDuplicated {
 		for _, targetCluster := range bindingSpec.Clusters {
-			if targetCluster.Replicas != bindingSpec.Replicas {
+			if targetCluster.Replicas != bindingReplicas {
 				return true
 			}
 		}
 		return false
 	}
 	if strategy.ReplicaSchedulingType == policyv1alpha1.ReplicaSchedulingTypeDivided {
 		replicasSum := GetSumOfReplicas(bindingSpec.Clusters)
-		return replicasSum != bindingSpec.Replicas
+		return replicasSum != bindingReplicas
 	}
 	return false
 }
 
+// GetTotalBindingReplicas will get the total replicas for a given resourcebinding
+func GetTotalBindingReplicas(bindingSpec *workv1alpha2.ResourceBindingSpec) int32 {
+	if len(bindingSpec.Components) > 0 {
+		return GetSumOfReplicasForComponents(bindingSpec.Components)
+	}
+	return bindingSpec.Replicas
+}
+
+// GetSumOfReplicasForComponents will get the sum of replicas for multi-component resources
+func GetSumOfReplicasForComponents(components []workv1alpha2.Component) int32 {
+	replicasSum := int32(0)
+	for _, component := range components {
+		replicasSum += component.Replicas
+	}
+	return replicasSum
+}
+
 // GetSumOfReplicas will get the sum of replicas in target clusters
 func GetSumOfReplicas(clusters []workv1alpha2.TargetCluster) int32 {
 	replicasSum := int32(0)

pkg/util/binding_test.go

@@ -177,6 +177,60 @@ func TestIsBindingReplicasChanged(t *testing.T) {
 			strategy: &policyv1alpha1.ReplicaSchedulingStrategy{ReplicaSchedulingType: policyv1alpha1.ReplicaSchedulingTypeDivided},
 			expected: true,
 		},
+		{
+			name: "Duplicated strategy with components not changed",
+			bindingSpec: &workv1alpha2.ResourceBindingSpec{
+				Components: []workv1alpha2.Component{
+					{
+						Name:     "jobmanager",
+						Replicas: 2,
+					},
+					{
+						Name:     "taskmanager",
+						Replicas: 3,
+					},
+				},
+				Clusters: []workv1alpha2.TargetCluster{
+					{
+						Name:     ClusterMember1,
+						Replicas: 5,
+					},
+					{
+						Name:     ClusterMember2,
+						Replicas: 5,
+					},
+				},
+			},
+			strategy: &policyv1alpha1.ReplicaSchedulingStrategy{ReplicaSchedulingType: policyv1alpha1.ReplicaSchedulingTypeDuplicated},
+			expected: false,
+		},
+		{
+			name: "Divided strategy with components changed",
+			bindingSpec: &workv1alpha2.ResourceBindingSpec{
+				Components: []workv1alpha2.Component{
+					{
+						Name:     "jobmanager",
+						Replicas: 2,
+					},
+					{
+						Name:     "taskmanager",
+						Replicas: 3,
+					},
+				},
+				Clusters: []workv1alpha2.TargetCluster{
+					{
+						Name:     ClusterMember1,
+						Replicas: 2,
+					},
+					{
+						Name:     ClusterMember2,
+						Replicas: 2, // assigned sum = 4 != desired 5
+					},
+				},
+			},
+			strategy: &policyv1alpha1.ReplicaSchedulingStrategy{ReplicaSchedulingType: policyv1alpha1.ReplicaSchedulingTypeDivided},
+			expected: true,
+		},
 	}
 
 	for _, tt := range tests {