From 1208c53c8bccb50825b5840b7b9fb8b2e917fa94 Mon Sep 17 00:00:00 2001 From: KeZhang Date: Fri, 11 Dec 2020 14:22:20 +0800 Subject: [PATCH] cleanup constants for scheduler metrics --- pkg/scheduler/core/generic_scheduler.go | 4 ++-- pkg/scheduler/metrics/metrics.go | 7 ++----- pkg/scheduler/scheduler.go | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go index 961038dbe1b..f79b20d8a2f 100644 --- a/pkg/scheduler/core/generic_scheduler.go +++ b/pkg/scheduler/core/generic_scheduler.go @@ -525,9 +525,9 @@ func (g *genericScheduler) prioritizeNodes( } wg.Add(1) go func(extIndex int) { - metrics.SchedulerGoroutines.WithLabelValues("prioritizing_extender").Inc() + metrics.SchedulerGoroutines.WithLabelValues(metrics.PrioritizingExtender).Inc() defer func() { - metrics.SchedulerGoroutines.WithLabelValues("prioritizing_extender").Dec() + metrics.SchedulerGoroutines.WithLabelValues(metrics.PrioritizingExtender).Dec() wg.Done() }() prioritizedList, weight, err := g.extenders[extIndex].Prioritize(pod, nodes) diff --git a/pkg/scheduler/metrics/metrics.go b/pkg/scheduler/metrics/metrics.go index 4b8d82d52df..d11412ab66f 100644 --- a/pkg/scheduler/metrics/metrics.go +++ b/pkg/scheduler/metrics/metrics.go @@ -28,13 +28,10 @@ import ( const ( // SchedulerSubsystem - subsystem name used by scheduler SchedulerSubsystem = "scheduler" - - // OperationLabel - operation label name - OperationLabel = "operation" // Below are possible values for the operation label. Each represents a substep of e2e scheduling: - // PreemptionEvaluation - preemption evaluation operation label value (occurs in case of scheduling fitError). - PreemptionEvaluation = "preemption_evaluation" + // PrioritizingExtender - prioritizing extender operation label value + PrioritizingExtender = "prioritizing_extender" // Binding - binding operation label value Binding = "binding" // E2eScheduling - e2e scheduling operation label value diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 556139dc2c4..375c540376d 100755 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -542,8 +542,8 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { go func() { bindingCycleCtx, cancel := context.WithCancel(ctx) defer cancel() - metrics.SchedulerGoroutines.WithLabelValues("binding").Inc() - defer metrics.SchedulerGoroutines.WithLabelValues("binding").Dec() + metrics.SchedulerGoroutines.WithLabelValues(metrics.Binding).Inc() + defer metrics.SchedulerGoroutines.WithLabelValues(metrics.Binding).Dec() waitOnPermitStatus := fwk.WaitOnPermit(bindingCycleCtx, assumedPod) if !waitOnPermitStatus.IsSuccess() {