diff --git a/pkg/scheduler/framework/runtime/framework.go b/pkg/scheduler/framework/runtime/framework.go index 7f078caa6d4..65707eeeb27 100644 --- a/pkg/scheduler/framework/runtime/framework.go +++ b/pkg/scheduler/framework/runtime/framework.go @@ -1004,8 +1004,7 @@ func (f *frameworkImpl) RunPermitPlugins(ctx context.Context, state *framework.C status, timeout := f.runPermitPlugin(ctx, pl, state, pod, nodeName) if !status.IsSuccess() { if status.IsUnschedulable() { - msg := fmt.Sprintf("rejected pod %q by permit plugin %q: %v", pod.Name, pl.Name(), status.Message()) - klog.V(4).Infof(msg) + klog.V(4).InfoS("Pod rejected by permit plugin", "pod", klog.KObj(pod), "plugin", pl.Name(), "status", status.Message()) status.SetFailedPlugin(pl.Name()) return status } @@ -1027,7 +1026,7 @@ func (f *frameworkImpl) RunPermitPlugins(ctx context.Context, state *framework.C waitingPod := newWaitingPod(pod, pluginsWaitTime) f.waitingPods.add(waitingPod) msg := fmt.Sprintf("one or more plugins asked to wait and no plugin rejected pod %q", pod.Name) - klog.V(4).Infof(msg) + klog.V(4).InfoS("One or more plugins asked to wait and no plugin rejected pod", "pod", klog.KObj(pod)) return framework.NewStatus(framework.Wait, msg) } return nil @@ -1050,7 +1049,7 @@ func (f *frameworkImpl) WaitOnPermit(ctx context.Context, pod *v1.Pod) *framewor return nil } defer f.waitingPods.remove(pod.UID) - klog.V(4).Infof("pod %q waiting on permit", pod.Name) + klog.V(4).InfoS("Pod waiting on permit", "pod", klog.KObj(pod)) startTime := time.Now() s := <-waitingPod.s @@ -1058,8 +1057,7 @@ func (f *frameworkImpl) WaitOnPermit(ctx context.Context, pod *v1.Pod) *framewor if !s.IsSuccess() { if s.IsUnschedulable() { - msg := fmt.Sprintf("pod %q rejected while waiting on permit: %v", pod.Name, s.Message()) - klog.V(4).Infof(msg) + klog.V(4).InfoS("Pod rejected while waiting on permit", "pod", klog.KObj(pod), "status", s.Message()) s.SetFailedPlugin(s.FailedPlugin()) return s } diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 187e01f78a9..81093295c7a 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -435,7 +435,7 @@ func (sched *Scheduler) assume(assumed *v1.Pod, host string) error { assumed.Spec.NodeName = host if err := sched.SchedulerCache.AssumePod(assumed); err != nil { - klog.ErrorS(err, "scheduler cache AssumePod failed") + klog.ErrorS(err, "Scheduler cache AssumePod failed") return err } // if "assumed" is a nominated pod, we should remove it from internal cache @@ -484,7 +484,7 @@ func (sched *Scheduler) extendersBinding(pod *v1.Pod, node string) (bool, error) func (sched *Scheduler) finishBinding(fwk framework.Framework, assumed *v1.Pod, targetNode string, err error) { if finErr := sched.SchedulerCache.FinishBinding(assumed); finErr != nil { - klog.ErrorS(finErr, "scheduler cache FinishBinding failed") + klog.ErrorS(finErr, "Scheduler cache FinishBinding failed") } if err != nil { klog.V(1).InfoS("Failed to bind pod", "pod", klog.KObj(assumed)) @@ -585,7 +585,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { // trigger un-reserve to clean up state associated with the reserved Pod fwk.RunReservePluginsUnreserve(schedulingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { - klog.ErrorS(forgetErr, "scheduler cache ForgetPod failed") + klog.ErrorS(forgetErr, "Scheduler cache ForgetPod failed") } sched.recordSchedulingFailure(fwk, assumedPodInfo, sts.AsError(), SchedulerError, "") return @@ -605,7 +605,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { // One of the plugins returned status different than success or wait. fwk.RunReservePluginsUnreserve(schedulingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { - klog.ErrorS(forgetErr, "scheduler cache ForgetPod failed") + klog.ErrorS(forgetErr, "Scheduler cache ForgetPod failed") } sched.recordSchedulingFailure(fwk, assumedPodInfo, runPermitStatus.AsError(), reason, "") return diff --git a/pkg/scheduler/util/utils.go b/pkg/scheduler/util/utils.go index 7f8c8dde3d6..3d4656c6e21 100644 --- a/pkg/scheduler/util/utils.go +++ b/pkg/scheduler/util/utils.go @@ -56,7 +56,7 @@ func GetPodStartTime(pod *v1.Pod) *metav1.Time { func GetEarliestPodStartTime(victims *extenderv1.Victims) *metav1.Time { if len(victims.Pods) == 0 { // should not reach here. - klog.Errorf("victims.Pods is empty. Should not reach here.") + klog.ErrorS(fmt.Errorf("victims.Pods is empty. Should not reach here"), "") return nil }