From 746d6bdff354075f42f0de70a5d714ec119e7337 Mon Sep 17 00:00:00 2001 From: googs1025 Date: Wed, 17 Apr 2024 12:21:31 +0800 Subject: [PATCH] fix: fix gang log level Signed-off-by: googs1025 --- .../plugins/coscheduling/core/gang.go | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkg/scheduler/plugins/coscheduling/core/gang.go b/pkg/scheduler/plugins/coscheduling/core/gang.go index 6e64a281e..15de848d9 100644 --- a/pkg/scheduler/plugins/coscheduling/core/gang.go +++ b/pkg/scheduler/plugins/coscheduling/core/gang.go @@ -124,11 +124,12 @@ func (gang *Gang) tryInitByPodConfig(pod *v1.Pod, args *config.CoschedulingArgs) totalChildrenNum, err := strconv.ParseInt(pod.Annotations[extension.AnnotationGangTotalNum], 10, 32) if err != nil { - klog.Errorf("pod's annotation totalNumber illegal, gangName: %v, value: %v", + klog.V(4).ErrorS(err, "pod's annotation totalNumber illegal, gangName: %v, value: %v", gang.Name, pod.Annotations[extension.AnnotationGangTotalNum]) totalChildrenNum = int64(minRequiredNumber) } else if totalChildrenNum != 0 && totalChildrenNum < int64(minRequiredNumber) { - klog.Errorf("pod's annotation totalNumber cannot less than minRequiredNumber, gangName: %v, totalNumber: %v,minRequiredNumber: %v", + + klog.V(4).Infof("pod's annotation totalNumber cannot less than minRequiredNumber, gangName: %v, totalNumber: %v,minRequiredNumber: %v", gang.Name, pod.Annotations[extension.AnnotationGangTotalNum], minRequiredNumber) totalChildrenNum = int64(minRequiredNumber) } @@ -136,7 +137,7 @@ func (gang *Gang) tryInitByPodConfig(pod *v1.Pod, args *config.CoschedulingArgs) mode := pod.Annotations[extension.AnnotationGangMode] if mode != extension.GangModeStrict && mode != extension.GangModeNonStrict { - klog.Errorf("pod's annotation GangModeAnnotation illegal, gangName: %v, value: %v", + klog.V(4).Infof("pod's annotation GangModeAnnotation illegal, gangName: %v, value: %v", gang.Name, pod.Annotations[extension.AnnotationGangMode]) mode = extension.GangModeStrict } @@ -145,7 +146,7 @@ func (gang *Gang) tryInitByPodConfig(pod *v1.Pod, args *config.CoschedulingArgs) matchPolicy := util.GetGangMatchPolicyByPod(pod) if matchPolicy != extension.GangMatchPolicyOnlyWaiting && matchPolicy != extension.GangMatchPolicyWaitingAndRunning && matchPolicy != extension.GangMatchPolicyOnceSatisfied { - klog.Errorf("pod's annotation AnnotationGangMatchPolicy illegal, gangName: %v, value: %v", + klog.V(4).Infof("pod's annotation AnnotationGangMatchPolicy illegal, gangName: %v, value: %v", gang.Name, matchPolicy) matchPolicy = extension.GangMatchPolicyOnceSatisfied } @@ -157,7 +158,7 @@ func (gang *Gang) tryInitByPodConfig(pod *v1.Pod, args *config.CoschedulingArgs) waitTime, err := time.ParseDuration(pod.Annotations[extension.AnnotationGangWaitTime]) if err != nil || waitTime <= 0 { - klog.Errorf("pod's annotation GangWaitTimeAnnotation illegal, gangName: %v, value: %v", + klog.V(4).ErrorS(err, "pod's annotation GangWaitTimeAnnotation illegal, gangName: %v, value: %v", gang.Name, pod.Annotations[extension.AnnotationGangWaitTime]) waitTime = args.DefaultTimeout.Duration } @@ -165,7 +166,7 @@ func (gang *Gang) tryInitByPodConfig(pod *v1.Pod, args *config.CoschedulingArgs) groupSlice, err := util.StringToGangGroupSlice(pod.Annotations[extension.AnnotationGangGroups]) if err != nil { - klog.Errorf("pod's annotation GangGroupsAnnotation illegal, gangName: %v, value: %v", + klog.V(4).ErrorS(err, "pod's annotation GangGroupsAnnotation illegal, gangName: %v, value: %v", gang.Name, pod.Annotations[extension.AnnotationGangGroups]) } if len(groupSlice) == 0 { @@ -191,11 +192,11 @@ func (gang *Gang) tryInitByPodGroup(pg *v1alpha1.PodGroup, args *config.Coschedu totalChildrenNum, err := strconv.ParseInt(pg.Annotations[extension.AnnotationGangTotalNum], 10, 32) if err != nil { - klog.Errorf("podGroup's annotation totalNumber illegal, gangName: %v, value: %v", + klog.V(4).ErrorS(err, "podGroup's annotation totalNumber illegal, gangName: %v, value: %v", gang.Name, pg.Annotations[extension.AnnotationGangTotalNum]) totalChildrenNum = int64(minRequiredNumber) } else if totalChildrenNum != 0 && totalChildrenNum < int64(minRequiredNumber) { - klog.Errorf("podGroup's annotation totalNumber cannot less than minRequiredNumber, gangName:%v, totalNumber: %v,minRequiredNumber: %v", + klog.V(4).Infof("podGroup's annotation totalNumber cannot less than minRequiredNumber, gangName:%v, totalNumber: %v,minRequiredNumber: %v", gang.Name, pg.Annotations[extension.AnnotationGangTotalNum], minRequiredNumber) totalChildrenNum = int64(minRequiredNumber) } @@ -203,7 +204,7 @@ func (gang *Gang) tryInitByPodGroup(pg *v1alpha1.PodGroup, args *config.Coschedu mode := pg.Annotations[extension.AnnotationGangMode] if mode != extension.GangModeStrict && mode != extension.GangModeNonStrict { - klog.Errorf("podGroup's annotation GangModeAnnotation illegal, gangName: %v, value: %v", + klog.V(4).Infof("podGroup's annotation GangModeAnnotation illegal, gangName: %v, value: %v", gang.Name, pg.Annotations[extension.AnnotationGangMode]) mode = extension.GangModeStrict } @@ -212,7 +213,7 @@ func (gang *Gang) tryInitByPodGroup(pg *v1alpha1.PodGroup, args *config.Coschedu matchPolicy := pg.Annotations[extension.AnnotationGangMatchPolicy] if matchPolicy != extension.GangMatchPolicyOnlyWaiting && matchPolicy != extension.GangMatchPolicyWaitingAndRunning && matchPolicy != extension.GangMatchPolicyOnceSatisfied { - klog.Errorf("podGroup's annotation AnnotationGangMatchPolicy illegal, gangName: %v, value: %v", + klog.V(4).Infof("podGroup's annotation AnnotationGangMatchPolicy illegal, gangName: %v, value: %v", gang.Name, matchPolicy) matchPolicy = extension.GangMatchPolicyOnceSatisfied } @@ -227,7 +228,7 @@ func (gang *Gang) tryInitByPodGroup(pg *v1alpha1.PodGroup, args *config.Coschedu groupSlice, err := util.StringToGangGroupSlice(pg.Annotations[extension.AnnotationGangGroups]) if err != nil { - klog.Errorf("podGroup's annotation GangGroupsAnnotation illegal, gangName: %v, value: %v", + klog.V(4).ErrorS(err, "podGroup's annotation GangGroupsAnnotation illegal, gangName: %v, value: %v", gang.Name, pg.Annotations[extension.AnnotationGangGroups]) } if len(groupSlice) == 0 {