From bfea4890c59e9a41cfa206fef52c48ff85585f03 Mon Sep 17 00:00:00 2001 From: Kensei Nakada Date: Thu, 21 Nov 2024 16:14:26 +0900 Subject: [PATCH] cleanup: remove pod_scheduling_duration_seconds --- pkg/scheduler/metrics/metrics.go | 18 ----------- pkg/scheduler/schedule_one.go | 1 - .../testdata/stable-metrics-list.yaml | 30 ------------------- 3 files changed, 49 deletions(-) diff --git a/pkg/scheduler/metrics/metrics.go b/pkg/scheduler/metrics/metrics.go index 7fc649793b7..c230b38f0f6 100644 --- a/pkg/scheduler/metrics/metrics.go +++ b/pkg/scheduler/metrics/metrics.go @@ -102,9 +102,6 @@ var ( InFlightEvents *metrics.GaugeVec Goroutines *metrics.GaugeVec - // PodSchedulingDuration is deprecated as of Kubernetes v1.28, and will be removed - // in v1.31. Please use PodSchedulingSLIDuration instead. - PodSchedulingDuration *metrics.HistogramVec PodSchedulingSLIDuration *metrics.HistogramVec PodSchedulingAttempts *metrics.Histogram FrameworkExtensionPointDuration *metrics.HistogramVec @@ -220,20 +217,6 @@ func InitMetrics() { StabilityLevel: metrics.ALPHA, }, []string{"operation"}) - // PodSchedulingDuration is deprecated as of Kubernetes v1.28, and will be removed - // in v1.31. Please use PodSchedulingSLIDuration instead. - PodSchedulingDuration = metrics.NewHistogramVec( - &metrics.HistogramOpts{ - Subsystem: SchedulerSubsystem, - Name: "pod_scheduling_duration_seconds", - Help: "E2e latency for a pod being scheduled which may include multiple scheduling attempts.", - // Start with 10ms with the last bucket being [~88m, Inf). - Buckets: metrics.ExponentialBuckets(0.01, 2, 20), - StabilityLevel: metrics.STABLE, - DeprecatedVersion: "1.29.0", - }, - []string{"attempts"}) - PodSchedulingSLIDuration = metrics.NewHistogramVec( &metrics.HistogramOpts{ Subsystem: SchedulerSubsystem, @@ -359,7 +342,6 @@ func InitMetrics() { PreemptionVictims, PreemptionAttempts, pendingPods, - PodSchedulingDuration, PodSchedulingSLIDuration, PodSchedulingAttempts, FrameworkExtensionPointDuration, diff --git a/pkg/scheduler/schedule_one.go b/pkg/scheduler/schedule_one.go index 11bb4933870..12a943e1c35 100644 --- a/pkg/scheduler/schedule_one.go +++ b/pkg/scheduler/schedule_one.go @@ -326,7 +326,6 @@ func (sched *Scheduler) bindingCycle( metrics.PodScheduled(fwk.ProfileName(), metrics.SinceInSeconds(start)) metrics.PodSchedulingAttempts.Observe(float64(assumedPodInfo.Attempts)) if assumedPodInfo.InitialAttemptTimestamp != nil { - metrics.PodSchedulingDuration.WithLabelValues(getAttemptsLabel(assumedPodInfo)).Observe(metrics.SinceInSeconds(*assumedPodInfo.InitialAttemptTimestamp)) metrics.PodSchedulingSLIDuration.WithLabelValues(getAttemptsLabel(assumedPodInfo)).Observe(metrics.SinceInSeconds(*assumedPodInfo.InitialAttemptTimestamp)) } // Run "postbind" plugins. diff --git a/test/instrumentation/testdata/stable-metrics-list.yaml b/test/instrumentation/testdata/stable-metrics-list.yaml index 20ce1738d15..b64e847be3d 100644 --- a/test/instrumentation/testdata/stable-metrics-list.yaml +++ b/test/instrumentation/testdata/stable-metrics-list.yaml @@ -572,36 +572,6 @@ - 4 - 8 - 16 -- name: pod_scheduling_duration_seconds - subsystem: scheduler - help: E2e latency for a pod being scheduled which may include multiple scheduling - attempts. - type: Histogram - deprecatedVersion: 1.29.0 - stabilityLevel: STABLE - labels: - - attempts - buckets: - - 0.01 - - 0.02 - - 0.04 - - 0.08 - - 0.16 - - 0.32 - - 0.64 - - 1.28 - - 2.56 - - 5.12 - - 10.24 - - 20.48 - - 40.96 - - 81.92 - - 163.84 - - 327.68 - - 655.36 - - 1310.72 - - 2621.44 - - 5242.88 - name: preemption_attempts_total subsystem: scheduler help: Total preemption attempts in the cluster till now