Skip to content

Commit 44cd4fc

Browse files
authored
Merge pull request kubernetes#95001 from arghya88/deprecate-scheduler-metrics
deprecate scheduler metrics
2 parents 807db80 + 078b355 commit 44cd4fc

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (pl *DefaultPreemption) PostFilter(ctx context.Context, state *framework.Cy
7979
preemptionStartTime := time.Now()
8080
defer func() {
8181
metrics.PreemptionAttempts.Inc()
82-
metrics.SchedulingAlgorithmPreemptionEvaluationDuration.Observe(metrics.SinceInSeconds(preemptionStartTime))
82+
metrics.DeprecatedSchedulingAlgorithmPreemptionEvaluationDuration.Observe(metrics.SinceInSeconds(preemptionStartTime))
8383
}()
8484

8585
nnn, err := pl.preempt(ctx, state, pod, m)

pkg/scheduler/metrics/metrics.go

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,24 @@ var (
6767
StabilityLevel: metrics.ALPHA,
6868
},
6969
)
70-
SchedulingAlgorithmPreemptionEvaluationDuration = metrics.NewHistogram(
70+
DeprecatedSchedulingAlgorithmPreemptionEvaluationDuration = metrics.NewHistogram(
7171
&metrics.HistogramOpts{
72-
Subsystem: SchedulerSubsystem,
73-
Name: "scheduling_algorithm_preemption_evaluation_seconds",
74-
Help: "Scheduling algorithm preemption evaluation duration in seconds",
75-
Buckets: metrics.ExponentialBuckets(0.001, 2, 15),
76-
StabilityLevel: metrics.ALPHA,
72+
Subsystem: SchedulerSubsystem,
73+
Name: "scheduling_algorithm_preemption_evaluation_seconds",
74+
Help: "Scheduling algorithm preemption evaluation duration in seconds",
75+
Buckets: metrics.ExponentialBuckets(0.001, 2, 15),
76+
StabilityLevel: metrics.ALPHA,
77+
DeprecatedVersion: "1.20.0",
7778
},
7879
)
79-
BindingLatency = metrics.NewHistogram(
80+
DeprecatedBindingLatency = metrics.NewHistogram(
8081
&metrics.HistogramOpts{
81-
Subsystem: SchedulerSubsystem,
82-
Name: "binding_duration_seconds",
83-
Help: "Binding latency in seconds",
84-
Buckets: metrics.ExponentialBuckets(0.001, 2, 15),
85-
StabilityLevel: metrics.ALPHA,
82+
Subsystem: SchedulerSubsystem,
83+
Name: "binding_duration_seconds",
84+
Help: "Binding latency in seconds",
85+
Buckets: metrics.ExponentialBuckets(0.001, 2, 15),
86+
StabilityLevel: metrics.ALPHA,
87+
DeprecatedVersion: "1.20.0",
8688
},
8789
)
8890
PreemptionVictims = metrics.NewHistogram(
@@ -189,8 +191,8 @@ var (
189191
scheduleAttempts,
190192
e2eSchedulingLatency,
191193
SchedulingAlgorithmLatency,
192-
BindingLatency,
193-
SchedulingAlgorithmPreemptionEvaluationDuration,
194+
DeprecatedBindingLatency,
195+
DeprecatedSchedulingAlgorithmPreemptionEvaluationDuration,
194196
PreemptionVictims,
195197
PreemptionAttempts,
196198
pendingPods,

pkg/scheduler/scheduler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ func (sched *Scheduler) finishBinding(prof *profile.Profile, assumed *v1.Pod, ta
412412
return
413413
}
414414

415-
metrics.BindingLatency.Observe(metrics.SinceInSeconds(start))
415+
metrics.DeprecatedBindingLatency.Observe(metrics.SinceInSeconds(start))
416416
prof.Recorder.Eventf(assumed, nil, v1.EventTypeNormal, "Scheduled", "Binding", "Successfully assigned %v/%v to %v", assumed.Namespace, assumed.Name, targetNode)
417417
}
418418

0 commit comments

Comments
 (0)