Merge pull request #2094 from sawsa307/delete-syncer-from-metrics-col…

…lector Delete syncers from metrics collector during GC
kubernetes · May 3, 2023 · 8321bc1 · 8321bc1
2 parents 8256c7e + b22558e
commit 8321bc1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/neg/manager.go b/pkg/neg/manager.go
@@ -472,6 +472,7 @@ func (manager *syncerManager) garbageCollectSyncer() {
 	for key, syncer := range manager.syncerMap {
 		if syncer.IsStopped() && !syncer.IsShuttingDown() {
 			delete(manager.syncerMap, key)
+			manager.syncerMetrics.DeleteSyncer(key)
 		}
 	}
 }

diff --git a/pkg/neg/metrics/neg_metrics_collector.go b/pkg/neg/metrics/neg_metrics_collector.go
@@ -140,6 +140,15 @@ func (sm *SyncerMetrics) SetLabelPropagationStats(key negtypes.NegSyncerKey, lab
 	sm.syncerLabelProagationStats[key] = labelstatLabelPropagationStats
 }
 
+func (sm *SyncerMetrics) DeleteSyncer(key negtypes.NegSyncerKey) {
+	sm.mu.Lock()
+	defer sm.mu.Unlock()
+	delete(sm.syncerStatusMap, key)
+	delete(sm.syncerEndpointStateMap, key)
+	delete(sm.syncerEPSStateMap, key)
+	delete(sm.syncerLabelProagationStats, key)
+}
+
 // computeLabelMetrics aggregates label propagation metrics.
 func (sm *SyncerMetrics) computeLabelMetrics() LabelPropagationMetrics {
 	sm.mu.Lock()