From a0b58ed788493166c6b2e0a749a71d7225cb49f9 Mon Sep 17 00:00:00 2001 From: PeterChang Date: Mon, 4 Mar 2024 16:54:26 +0800 Subject: [PATCH] scheduler: resolve the wrong use of gangmod in gang init phase Signed-off-by: PeterChang --- pkg/scheduler/plugins/coscheduling/core/gang.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/scheduler/plugins/coscheduling/core/gang.go b/pkg/scheduler/plugins/coscheduling/core/gang.go index c4e535624..89a2a53db 100644 --- a/pkg/scheduler/plugins/coscheduling/core/gang.go +++ b/pkg/scheduler/plugins/coscheduling/core/gang.go @@ -139,8 +139,8 @@ func (gang *Gang) tryInitByPodConfig(pod *v1.Pod, args *config.CoschedulingArgs) gang.Mode = mode matchPolicy := util.GetGangMatchPolicyByPod(pod) - if matchPolicy != extension.GangMatchPolicyOnlyWaiting && mode != extension.GangMatchPolicyWaitingAndRunning && - mode != extension.GangMatchPolicyOnceSatisfied { + if matchPolicy != extension.GangMatchPolicyOnlyWaiting && matchPolicy != extension.GangMatchPolicyWaitingAndRunning && + matchPolicy != extension.GangMatchPolicyOnceSatisfied { klog.Errorf("pod's annotation AnnotationGangMatchPolicy illegal, gangName: %v, value: %v", gang.Name, matchPolicy) matchPolicy = extension.GangMatchPolicyOnceSatisfied @@ -205,9 +205,9 @@ func (gang *Gang) tryInitByPodGroup(pg *v1alpha1.PodGroup, args *config.Coschedu gang.Mode = mode matchPolicy := pg.Annotations[extension.AnnotationGangMatchPolicy] - if matchPolicy != extension.GangMatchPolicyOnlyWaiting && mode != extension.GangMatchPolicyWaitingAndRunning && - mode != extension.GangMatchPolicyOnceSatisfied { - klog.Errorf("pod's annotation AnnotationGangMatchPolicy illegal, gangName: %v, value: %v", + if matchPolicy != extension.GangMatchPolicyOnlyWaiting && matchPolicy != extension.GangMatchPolicyWaitingAndRunning && + matchPolicy != extension.GangMatchPolicyOnceSatisfied { + klog.Errorf("podGroup's annotation AnnotationGangMatchPolicy illegal, gangName: %v, value: %v", gang.Name, matchPolicy) matchPolicy = extension.GangMatchPolicyOnceSatisfied }