From 65b243fcd60a6164e5e164b07ed2759d13cafd45 Mon Sep 17 00:00:00 2001 From: googs1025 Date: Fri, 15 Nov 2024 14:50:31 +0800 Subject: [PATCH] chore: remove repeated scheduler prefix metrics for CacheSizeMetrics --- pkg/scheduler/backend/cache/cache.go | 8 ++++++++ pkg/scheduler/metrics/metrics.go | 19 ++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/pkg/scheduler/backend/cache/cache.go b/pkg/scheduler/backend/cache/cache.go index 99736448115..f71cfc4461e 100644 --- a/pkg/scheduler/backend/cache/cache.go +++ b/pkg/scheduler/backend/cache/cache.go @@ -757,4 +757,12 @@ func (cache *cacheImpl) updateMetrics() { metrics.CacheSize.WithLabelValues("assumed_pods").Set(float64(len(cache.assumedPods))) metrics.CacheSize.WithLabelValues("pods").Set(float64(len(cache.podStates))) metrics.CacheSize.WithLabelValues("nodes").Set(float64(len(cache.nodes))) + + // we intentionally keep them with the deprecation and will remove at v1.33. + //nolint:staticcheck + metrics.SchedulerCacheSize.WithLabelValues("assumed_pods").Set(float64(len(cache.assumedPods))) + //nolint:staticcheck + metrics.SchedulerCacheSize.WithLabelValues("pods").Set(float64(len(cache.podStates))) + //nolint:staticcheck + metrics.SchedulerCacheSize.WithLabelValues("nodes").Set(float64(len(cache.nodes))) } diff --git a/pkg/scheduler/metrics/metrics.go b/pkg/scheduler/metrics/metrics.go index 7fc649793b7..0f4bd0facc3 100644 --- a/pkg/scheduler/metrics/metrics.go +++ b/pkg/scheduler/metrics/metrics.go @@ -110,8 +110,11 @@ var ( FrameworkExtensionPointDuration *metrics.HistogramVec PluginExecutionDuration *metrics.HistogramVec - PermitWaitDuration *metrics.HistogramVec - CacheSize *metrics.GaugeVec + PermitWaitDuration *metrics.HistogramVec + CacheSize *metrics.GaugeVec + // Deprecated: SchedulerCacheSize is deprecated, + // and will be removed at v1.33. Please use CacheSize instead. + SchedulerCacheSize *metrics.GaugeVec unschedulableReasons *metrics.GaugeVec PluginEvaluationTotal *metrics.CounterVec @@ -308,10 +311,19 @@ func InitMetrics() { }, []string{"result"}) + SchedulerCacheSize = metrics.NewGaugeVec( + &metrics.GaugeOpts{ + Subsystem: SchedulerSubsystem, + Name: "scheduler_cache_size", + Help: "Number of nodes, pods, and assumed (bound) pods in the scheduler cache.", + StabilityLevel: metrics.ALPHA, + DeprecatedVersion: "1.33.0", + }, []string{"type"}) + CacheSize = metrics.NewGaugeVec( &metrics.GaugeOpts{ Subsystem: SchedulerSubsystem, - Name: "scheduler_cache_size", + Name: "cache_size", Help: "Number of nodes, pods, and assumed (bound) pods in the scheduler cache.", StabilityLevel: metrics.ALPHA, }, []string{"type"}) @@ -368,6 +380,7 @@ func InitMetrics() { Goroutines, PermitWaitDuration, CacheSize, + SchedulerCacheSize, unschedulableReasons, PluginEvaluationTotal, }