From 97676963c3968a852fe7563c177b6b280544d99f Mon Sep 17 00:00:00 2001 From: sunxiaofei03 Date: Tue, 24 Dec 2019 19:41:01 +0800 Subject: [PATCH] deprecate scheduling_algorithm_predicate/priority_evaluation_seconds --- pkg/scheduler/core/generic_scheduler.go | 6 ++--- pkg/scheduler/metrics/metrics.go | 30 +++++++++++++------------ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go index 58da1416aee..6ee303844c4 100644 --- a/pkg/scheduler/core/generic_scheduler.go +++ b/pkg/scheduler/core/generic_scheduler.go @@ -218,7 +218,7 @@ func (g *genericScheduler) Schedule(ctx context.Context, state *framework.CycleS } } trace.Step("Running postfilter plugins done") - metrics.SchedulingAlgorithmPredicateEvaluationDuration.Observe(metrics.SinceInSeconds(startPredicateEvalTime)) + metrics.DeprecatedSchedulingAlgorithmPredicateEvaluationSecondsDuration.Observe(metrics.SinceInSeconds(startPredicateEvalTime)) metrics.DeprecatedSchedulingAlgorithmPredicateEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPredicateEvalTime)) metrics.SchedulingLatency.WithLabelValues(metrics.PredicateEvaluation).Observe(metrics.SinceInSeconds(startPredicateEvalTime)) metrics.DeprecatedSchedulingLatency.WithLabelValues(metrics.PredicateEvaluation).Observe(metrics.SinceInSeconds(startPredicateEvalTime)) @@ -226,7 +226,7 @@ func (g *genericScheduler) Schedule(ctx context.Context, state *framework.CycleS startPriorityEvalTime := time.Now() // When only one node after predicate, just use it. if len(filteredNodes) == 1 { - metrics.SchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInSeconds(startPriorityEvalTime)) + metrics.DeprecatedSchedulingAlgorithmPriorityEvaluationSecondsDuration.Observe(metrics.SinceInSeconds(startPriorityEvalTime)) metrics.DeprecatedSchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPriorityEvalTime)) return ScheduleResult{ SuggestedHost: filteredNodes[0].Name, @@ -241,7 +241,7 @@ func (g *genericScheduler) Schedule(ctx context.Context, state *framework.CycleS return result, err } - metrics.SchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInSeconds(startPriorityEvalTime)) + metrics.DeprecatedSchedulingAlgorithmPriorityEvaluationSecondsDuration.Observe(metrics.SinceInSeconds(startPriorityEvalTime)) metrics.DeprecatedSchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPriorityEvalTime)) metrics.SchedulingLatency.WithLabelValues(metrics.PriorityEvaluation).Observe(metrics.SinceInSeconds(startPriorityEvalTime)) metrics.DeprecatedSchedulingLatency.WithLabelValues(metrics.PriorityEvaluation).Observe(metrics.SinceInSeconds(startPriorityEvalTime)) diff --git a/pkg/scheduler/metrics/metrics.go b/pkg/scheduler/metrics/metrics.go index a98d59cfb70..cc5d32cf879 100644 --- a/pkg/scheduler/metrics/metrics.go +++ b/pkg/scheduler/metrics/metrics.go @@ -126,13 +126,14 @@ var ( DeprecatedVersion: "1.14.0", }, ) - SchedulingAlgorithmPredicateEvaluationDuration = metrics.NewHistogram( + DeprecatedSchedulingAlgorithmPredicateEvaluationSecondsDuration = metrics.NewHistogram( &metrics.HistogramOpts{ - Subsystem: SchedulerSubsystem, - Name: "scheduling_algorithm_predicate_evaluation_seconds", - Help: "Scheduling algorithm predicate evaluation duration in seconds", - Buckets: metrics.ExponentialBuckets(0.001, 2, 15), - StabilityLevel: metrics.ALPHA, + Subsystem: SchedulerSubsystem, + Name: "scheduling_algorithm_predicate_evaluation_seconds", + Help: "Scheduling algorithm predicate evaluation duration in seconds", + Buckets: metrics.ExponentialBuckets(0.001, 2, 15), + StabilityLevel: metrics.ALPHA, + DeprecatedVersion: "1.18.0", }, ) DeprecatedSchedulingAlgorithmPredicateEvaluationDuration = metrics.NewHistogram( @@ -145,13 +146,14 @@ var ( DeprecatedVersion: "1.14.0", }, ) - SchedulingAlgorithmPriorityEvaluationDuration = metrics.NewHistogram( + DeprecatedSchedulingAlgorithmPriorityEvaluationSecondsDuration = metrics.NewHistogram( &metrics.HistogramOpts{ - Subsystem: SchedulerSubsystem, - Name: "scheduling_algorithm_priority_evaluation_seconds", - Help: "Scheduling algorithm priority evaluation duration in seconds", - Buckets: metrics.ExponentialBuckets(0.001, 2, 15), - StabilityLevel: metrics.ALPHA, + Subsystem: SchedulerSubsystem, + Name: "scheduling_algorithm_priority_evaluation_seconds", + Help: "Scheduling algorithm priority evaluation duration in seconds", + Buckets: metrics.ExponentialBuckets(0.001, 2, 15), + StabilityLevel: metrics.ALPHA, + DeprecatedVersion: "1.18.0", }, ) DeprecatedSchedulingAlgorithmPriorityEvaluationDuration = metrics.NewHistogram( @@ -311,9 +313,9 @@ var ( DeprecatedSchedulingAlgorithmLatency, BindingLatency, DeprecatedBindingLatency, - SchedulingAlgorithmPredicateEvaluationDuration, + DeprecatedSchedulingAlgorithmPredicateEvaluationSecondsDuration, DeprecatedSchedulingAlgorithmPredicateEvaluationDuration, - SchedulingAlgorithmPriorityEvaluationDuration, + DeprecatedSchedulingAlgorithmPriorityEvaluationSecondsDuration, DeprecatedSchedulingAlgorithmPriorityEvaluationDuration, SchedulingAlgorithmPreemptionEvaluationDuration, DeprecatedSchedulingAlgorithmPreemptionEvaluationDuration,