github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86584 from xiaoanyunfei/cleanup/deprecate_scheduler_metrics

Browse Source 
deprecate scheduling_algorithm_predicate_evaluation_seconds and sched…
This commit is contained in:
Kubernetes Prow Robot
2020-01-03 03:41:40 -08:00
committed by GitHub
parent 65ef5dcc51 97676963c3
commit 180e1c9f51
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/scheduler/core/generic_scheduler.go
View File

@@ -218,7 +218,7 @@ func (g *genericScheduler) Schedule(ctx context.Context, state *framework.CycleS
} }
} }
trace.Step("Running postfilter plugins done") 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.DeprecatedSchedulingAlgorithmPredicateEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPredicateEvalTime))
metrics.DeprecatedSchedulingDuration.WithLabelValues(metrics.PredicateEvaluation).Observe(metrics.SinceInSeconds(startPredicateEvalTime)) metrics.DeprecatedSchedulingDuration.WithLabelValues(metrics.PredicateEvaluation).Observe(metrics.SinceInSeconds(startPredicateEvalTime))
metrics.DeprecatedSchedulingLatency.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() startPriorityEvalTime := time.Now()
// When only one node after predicate, just use it. // When only one node after predicate, just use it.
if len(filteredNodes) == 1 { if len(filteredNodes) == 1 {
metrics.SchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInSeconds(startPriorityEvalTime)) metrics.DeprecatedSchedulingAlgorithmPriorityEvaluationSecondsDuration.Observe(metrics.SinceInSeconds(startPriorityEvalTime))
metrics.DeprecatedSchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPriorityEvalTime)) metrics.DeprecatedSchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPriorityEvalTime))
return ScheduleResult{ return ScheduleResult{
SuggestedHost: filteredNodes[0].Name, SuggestedHost: filteredNodes[0].Name,
@@ -241,7 +241,7 @@ func (g *genericScheduler) Schedule(ctx context.Context, state *framework.CycleS
return result, err return result, err
} }
metrics.SchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInSeconds(startPriorityEvalTime)) metrics.DeprecatedSchedulingAlgorithmPriorityEvaluationSecondsDuration.Observe(metrics.SinceInSeconds(startPriorityEvalTime))
metrics.DeprecatedSchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPriorityEvalTime)) metrics.DeprecatedSchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPriorityEvalTime))
metrics.DeprecatedSchedulingDuration.WithLabelValues(metrics.PriorityEvaluation).Observe(metrics.SinceInSeconds(startPriorityEvalTime)) metrics.DeprecatedSchedulingDuration.WithLabelValues(metrics.PriorityEvaluation).Observe(metrics.SinceInSeconds(startPriorityEvalTime))
metrics.DeprecatedSchedulingLatency.WithLabelValues(metrics.PriorityEvaluation).Observe(metrics.SinceInSeconds(startPriorityEvalTime)) metrics.DeprecatedSchedulingLatency.WithLabelValues(metrics.PriorityEvaluation).Observe(metrics.SinceInSeconds(startPriorityEvalTime))

30
pkg/scheduler/metrics/metrics.go
View File

@@ -127,13 +127,14 @@ var (
DeprecatedVersion: "1.14.0", DeprecatedVersion: "1.14.0",
}, },
) )
SchedulingAlgorithmPredicateEvaluationDuration = metrics.NewHistogram( DeprecatedSchedulingAlgorithmPredicateEvaluationSecondsDuration = metrics.NewHistogram(
&metrics.HistogramOpts{ &metrics.HistogramOpts{
Subsystem: SchedulerSubsystem, Subsystem: SchedulerSubsystem,
Name: "scheduling_algorithm_predicate_evaluation_seconds", Name: "scheduling_algorithm_predicate_evaluation_seconds",
Help: "Scheduling algorithm predicate evaluation duration in seconds", Help: "Scheduling algorithm predicate evaluation duration in seconds",
Buckets: metrics.ExponentialBuckets(0.001, 2, 15), Buckets: metrics.ExponentialBuckets(0.001, 2, 15),
StabilityLevel: metrics.ALPHA, StabilityLevel: metrics.ALPHA,
DeprecatedVersion: "1.18.0",
}, },
) )
DeprecatedSchedulingAlgorithmPredicateEvaluationDuration = metrics.NewHistogram( DeprecatedSchedulingAlgorithmPredicateEvaluationDuration = metrics.NewHistogram(
@@ -146,13 +147,14 @@ var (
DeprecatedVersion: "1.14.0", DeprecatedVersion: "1.14.0",
}, },
) )
SchedulingAlgorithmPriorityEvaluationDuration = metrics.NewHistogram( DeprecatedSchedulingAlgorithmPriorityEvaluationSecondsDuration = metrics.NewHistogram(
&metrics.HistogramOpts{ &metrics.HistogramOpts{
Subsystem: SchedulerSubsystem, Subsystem: SchedulerSubsystem,
Name: "scheduling_algorithm_priority_evaluation_seconds", Name: "scheduling_algorithm_priority_evaluation_seconds",
Help: "Scheduling algorithm priority evaluation duration in seconds", Help: "Scheduling algorithm priority evaluation duration in seconds",
Buckets: metrics.ExponentialBuckets(0.001, 2, 15), Buckets: metrics.ExponentialBuckets(0.001, 2, 15),
StabilityLevel: metrics.ALPHA, StabilityLevel: metrics.ALPHA,
DeprecatedVersion: "1.18.0",
}, },
) )
DeprecatedSchedulingAlgorithmPriorityEvaluationDuration = metrics.NewHistogram( DeprecatedSchedulingAlgorithmPriorityEvaluationDuration = metrics.NewHistogram(
@@ -312,9 +314,9 @@ var (
DeprecatedSchedulingAlgorithmLatency, DeprecatedSchedulingAlgorithmLatency,
BindingLatency, BindingLatency,
DeprecatedBindingLatency, DeprecatedBindingLatency,
SchedulingAlgorithmPredicateEvaluationDuration, DeprecatedSchedulingAlgorithmPredicateEvaluationSecondsDuration,
DeprecatedSchedulingAlgorithmPredicateEvaluationDuration, DeprecatedSchedulingAlgorithmPredicateEvaluationDuration,
SchedulingAlgorithmPriorityEvaluationDuration, DeprecatedSchedulingAlgorithmPriorityEvaluationSecondsDuration,
DeprecatedSchedulingAlgorithmPriorityEvaluationDuration, DeprecatedSchedulingAlgorithmPriorityEvaluationDuration,
SchedulingAlgorithmPreemptionEvaluationDuration, SchedulingAlgorithmPreemptionEvaluationDuration,
DeprecatedSchedulingAlgorithmPreemptionEvaluationDuration, DeprecatedSchedulingAlgorithmPreemptionEvaluationDuration,