diff --git a/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go b/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go index 73712159344..31186b4484b 100644 --- a/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go +++ b/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go @@ -79,7 +79,7 @@ func (pl *DefaultPreemption) PostFilter(ctx context.Context, state *framework.Cy preemptionStartTime := time.Now() defer func() { metrics.PreemptionAttempts.Inc() - metrics.SchedulingAlgorithmPreemptionEvaluationDuration.Observe(metrics.SinceInSeconds(preemptionStartTime)) + metrics.DeprecatedSchedulingAlgorithmPreemptionEvaluationDuration.Observe(metrics.SinceInSeconds(preemptionStartTime)) }() nnn, err := pl.preempt(ctx, state, pod, m) diff --git a/pkg/scheduler/metrics/metrics.go b/pkg/scheduler/metrics/metrics.go index 0586c5a7fc9..4b8d82d52df 100644 --- a/pkg/scheduler/metrics/metrics.go +++ b/pkg/scheduler/metrics/metrics.go @@ -67,22 +67,24 @@ var ( StabilityLevel: metrics.ALPHA, }, ) - SchedulingAlgorithmPreemptionEvaluationDuration = metrics.NewHistogram( + DeprecatedSchedulingAlgorithmPreemptionEvaluationDuration = metrics.NewHistogram( &metrics.HistogramOpts{ - Subsystem: SchedulerSubsystem, - Name: "scheduling_algorithm_preemption_evaluation_seconds", - Help: "Scheduling algorithm preemption evaluation duration in seconds", - Buckets: metrics.ExponentialBuckets(0.001, 2, 15), - StabilityLevel: metrics.ALPHA, + Subsystem: SchedulerSubsystem, + Name: "scheduling_algorithm_preemption_evaluation_seconds", + Help: "Scheduling algorithm preemption evaluation duration in seconds", + Buckets: metrics.ExponentialBuckets(0.001, 2, 15), + StabilityLevel: metrics.ALPHA, + DeprecatedVersion: "1.20.0", }, ) - BindingLatency = metrics.NewHistogram( + DeprecatedBindingLatency = metrics.NewHistogram( &metrics.HistogramOpts{ - Subsystem: SchedulerSubsystem, - Name: "binding_duration_seconds", - Help: "Binding latency in seconds", - Buckets: metrics.ExponentialBuckets(0.001, 2, 15), - StabilityLevel: metrics.ALPHA, + Subsystem: SchedulerSubsystem, + Name: "binding_duration_seconds", + Help: "Binding latency in seconds", + Buckets: metrics.ExponentialBuckets(0.001, 2, 15), + StabilityLevel: metrics.ALPHA, + DeprecatedVersion: "1.20.0", }, ) PreemptionVictims = metrics.NewHistogram( @@ -189,8 +191,8 @@ var ( scheduleAttempts, e2eSchedulingLatency, SchedulingAlgorithmLatency, - BindingLatency, - SchedulingAlgorithmPreemptionEvaluationDuration, + DeprecatedBindingLatency, + DeprecatedSchedulingAlgorithmPreemptionEvaluationDuration, PreemptionVictims, PreemptionAttempts, pendingPods, diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 69aa8adf256..5eaa0308c42 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -412,7 +412,7 @@ func (sched *Scheduler) finishBinding(prof *profile.Profile, assumed *v1.Pod, ta return } - metrics.BindingLatency.Observe(metrics.SinceInSeconds(start)) + metrics.DeprecatedBindingLatency.Observe(metrics.SinceInSeconds(start)) prof.Recorder.Eventf(assumed, nil, v1.EventTypeNormal, "Scheduled", "Binding", "Successfully assigned %v/%v to %v", assumed.Namespace, assumed.Name, targetNode) }