github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Structured Logging migration:modify Scheduler part logs.

Browse Source 
Signed-off-by: JunYang <yang.jun22@zte.com.cn>
This commit is contained in:
JunYang 2021-02-21 09:56:46 +08:00
parent 2584a7c0bb
commit 93047824f7
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/scheduler/framework/runtime/framework.go
View File

@ -1004,8 +1004,7 @@ func (f *frameworkImpl) RunPermitPlugins(ctx context.Context, state *framework.C
status, timeout := f.runPermitPlugin(ctx, pl, state, pod, nodeName) status, timeout := f.runPermitPlugin(ctx, pl, state, pod, nodeName)
if !status.IsSuccess() { if !status.IsSuccess() {
if status.IsUnschedulable() { if status.IsUnschedulable() {
msg := fmt.Sprintf("rejected pod %q by permit plugin %q: %v", pod.Name, pl.Name(), status.Message()) klog.V(4).InfoS("Pod rejected by permit plugin", "pod", klog.KObj(pod), "plugin", pl.Name(), "status", status.Message())
klog.V(4).Infof(msg)
status.SetFailedPlugin(pl.Name()) status.SetFailedPlugin(pl.Name())
return status return status
} }
@ -1027,7 +1026,7 @@ func (f *frameworkImpl) RunPermitPlugins(ctx context.Context, state *framework.C
waitingPod := newWaitingPod(pod, pluginsWaitTime) waitingPod := newWaitingPod(pod, pluginsWaitTime)
f.waitingPods.add(waitingPod) f.waitingPods.add(waitingPod)
msg := fmt.Sprintf("one or more plugins asked to wait and no plugin rejected pod %q", pod.Name) 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 framework.NewStatus(framework.Wait, msg)
} }
return nil return nil
@ -1050,7 +1049,7 @@ func (f *frameworkImpl) WaitOnPermit(ctx context.Context, pod *v1.Pod) *framewor
return nil return nil
} }
defer f.waitingPods.remove(pod.UID) 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() startTime := time.Now()
s := <-waitingPod.s s := <-waitingPod.s
@ -1058,8 +1057,7 @@ func (f *frameworkImpl) WaitOnPermit(ctx context.Context, pod *v1.Pod) *framewor
if !s.IsSuccess() { if !s.IsSuccess() {
if s.IsUnschedulable() { if s.IsUnschedulable() {
msg := fmt.Sprintf("pod %q rejected while waiting on permit: %v", pod.Name, s.Message()) klog.V(4).InfoS("Pod rejected while waiting on permit", "pod", klog.KObj(pod), "status", s.Message())
klog.V(4).Infof(msg)
s.SetFailedPlugin(s.FailedPlugin()) s.SetFailedPlugin(s.FailedPlugin())
return s return s
} }

8
pkg/scheduler/scheduler.go
View File

@ -435,7 +435,7 @@ func (sched *Scheduler) assume(assumed *v1.Pod, host string) error {
assumed.Spec.NodeName = host assumed.Spec.NodeName = host
if err := sched.SchedulerCache.AssumePod(assumed); err != nil { if err := sched.SchedulerCache.AssumePod(assumed); err != nil {
klog.ErrorS(err, "scheduler cache AssumePod failed") klog.ErrorS(err, "Scheduler cache AssumePod failed")
return err return err
} }
// if "assumed" is a nominated pod, we should remove it from internal cache // 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) { func (sched *Scheduler) finishBinding(fwk framework.Framework, assumed *v1.Pod, targetNode string, err error) {
if finErr := sched.SchedulerCache.FinishBinding(assumed); finErr != nil { 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 { if err != nil {
klog.V(1).InfoS("Failed to bind pod", "pod", klog.KObj(assumed)) 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 // trigger un-reserve to clean up state associated with the reserved Pod
fwk.RunReservePluginsUnreserve(schedulingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) fwk.RunReservePluginsUnreserve(schedulingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost)
if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { 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, "") sched.recordSchedulingFailure(fwk, assumedPodInfo, sts.AsError(), SchedulerError, "")
return return
@ -605,7 +605,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) {
// One of the plugins returned status different than success or wait. // One of the plugins returned status different than success or wait.
fwk.RunReservePluginsUnreserve(schedulingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) fwk.RunReservePluginsUnreserve(schedulingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost)
if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { 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, "") sched.recordSchedulingFailure(fwk, assumedPodInfo, runPermitStatus.AsError(), reason, "")
return return

2
pkg/scheduler/util/utils.go
View File

@ -56,7 +56,7 @@ func GetPodStartTime(pod *v1.Pod) *metav1.Time {
func GetEarliestPodStartTime(victims *extenderv1.Victims) *metav1.Time { func GetEarliestPodStartTime(victims *extenderv1.Victims) *metav1.Time {
if len(victims.Pods) == 0 { if len(victims.Pods) == 0 {
// should not reach here. // 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 return nil
} }