Unverified Commit 6e0d62d7 authored by Julien Mancuso's avatar Julien Mancuso Committed by GitHub
Browse files

fix: Fix multinode gang scheduling by setting MinAvailable to replica count on cliques (#7905)

parent 1caf6659
...@@ -1436,12 +1436,17 @@ func GenerateGrovePodCliqueSet( ...@@ -1436,12 +1436,17 @@ func GenerateGrovePodCliqueSet(
} }
} }
minAvailable := int32(1)
if isMultinode {
minAvailable = r.Replicas
}
clique := &grovev1alpha1.PodCliqueTemplateSpec{ clique := &grovev1alpha1.PodCliqueTemplateSpec{
Name: strings.ToLower(r.Name), Name: strings.ToLower(r.Name),
Spec: grovev1alpha1.PodCliqueSpec{ Spec: grovev1alpha1.PodCliqueSpec{
RoleName: strings.ToLower(r.Name), RoleName: strings.ToLower(r.Name),
Replicas: r.Replicas, Replicas: r.Replicas,
MinAvailable: ptr.To(int32(1)), MinAvailable: ptr.To(minAvailable),
PodSpec: *podSpec, PodSpec: *podSpec,
}, },
} }
......
...@@ -2258,7 +2258,7 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) { ...@@ -2258,7 +2258,7 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) {
Spec: grovev1alpha1.PodCliqueSpec{ Spec: grovev1alpha1.PodCliqueSpec{
RoleName: "worker-wkr", RoleName: "worker-wkr",
Replicas: 2, Replicas: 2,
MinAvailable: ptr.To(int32(1)), MinAvailable: ptr.To(int32(2)),
// StartsAfter: []string{"worker-ldr"}, // StartsAfter: []string{"worker-ldr"},
PodSpec: corev1.PodSpec{ PodSpec: corev1.PodSpec{
RestartPolicy: corev1.RestartPolicyAlways, RestartPolicy: corev1.RestartPolicyAlways,
...@@ -3256,7 +3256,7 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) { ...@@ -3256,7 +3256,7 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) {
Spec: grovev1alpha1.PodCliqueSpec{ Spec: grovev1alpha1.PodCliqueSpec{
RoleName: "worker-wkr", RoleName: "worker-wkr",
Replicas: 2, Replicas: 2,
MinAvailable: ptr.To(int32(1)), MinAvailable: ptr.To(int32(2)),
// StartsAfter: []string{"worker-ldr"}, // StartsAfter: []string{"worker-ldr"},
PodSpec: corev1.PodSpec{ PodSpec: corev1.PodSpec{
TerminationGracePeriodSeconds: ptr.To(int64(60)), TerminationGracePeriodSeconds: ptr.To(int64(60)),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment