github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79989 from tedyu/kube-metric-del

Browse Source 
Log warning if config labels deletion returns false
This commit is contained in:
Kubernetes Prow Robot 2019-07-16 13:23:00 -07:00 committed by GitHub
commit c92e7b4980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/metrics/metrics.go
View File

@ -497,7 +497,9 @@ func SetAssignedConfig(source *corev1.NodeConfigSource) error {
return err return err
} }
// clean up the old timeseries (WithLabelValues creates a new one for each distinct label set) // clean up the old timeseries (WithLabelValues creates a new one for each distinct label set)
AssignedConfig.Delete(assignedConfigLabels) if !AssignedConfig.Delete(assignedConfigLabels) {
klog.Warningf("Failed to delete metric for labels %v. This may result in ambiguity from multiple metrics concurrently indicating different assigned configs.", assignedConfigLabels)
}
// record the new timeseries // record the new timeseries
assignedConfigLabels = labels assignedConfigLabels = labels
// expose the new timeseries with a constant count of 1 // expose the new timeseries with a constant count of 1
@ -515,7 +517,9 @@ func SetActiveConfig(source *corev1.NodeConfigSource) error {
return err return err
} }
// clean up the old timeseries (WithLabelValues creates a new one for each distinct label set) // clean up the old timeseries (WithLabelValues creates a new one for each distinct label set)
ActiveConfig.Delete(activeConfigLabels) if !ActiveConfig.Delete(activeConfigLabels) {
klog.Warningf("Failed to delete metric for labels %v. This may result in ambiguity from multiple metrics concurrently indicating different active configs.", activeConfigLabels)
}
// record the new timeseries // record the new timeseries
activeConfigLabels = labels activeConfigLabels = labels
// expose the new timeseries with a constant count of 1 // expose the new timeseries with a constant count of 1
@ -533,7 +537,9 @@ func SetLastKnownGoodConfig(source *corev1.NodeConfigSource) error {
return err return err
} }
// clean up the old timeseries (WithLabelValues creates a new one for each distinct label set) // clean up the old timeseries (WithLabelValues creates a new one for each distinct label set)
LastKnownGoodConfig.Delete(lastKnownGoodConfigLabels) if !LastKnownGoodConfig.Delete(lastKnownGoodConfigLabels) {
klog.Warningf("Failed to delete metric for labels %v. This may result in ambiguity from multiple metrics concurrently indicating different last known good configs.", lastKnownGoodConfigLabels)
}
// record the new timeseries // record the new timeseries
lastKnownGoodConfigLabels = labels lastKnownGoodConfigLabels = labels
// expose the new timeseries with a constant count of 1 // expose the new timeseries with a constant count of 1