alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #581 from jsafrane/fix-recursive-lock

Browse Source 
Fix deadlock in recursive metric locks
This commit is contained in:
Kubernetes Prow Robot
2021-08-19 10:01:24 -07:00
committed by GitHub
parent f6026abfd3 5cfcb31222
commit c4a2ac7753
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/metrics/metrics.go
View File

@@ -231,7 +231,7 @@ func (opMgr *operationMetricsManager) RecordMetrics(opKey OperationKey, opStatus
obj, exists := opMgr.cache[createKey] obj, exists := opMgr.cache[createKey]
if exists { if exists {
// record a cancel metric if found // record a cancel metric if found
opMgr.recordCancelMetric(obj, createKey, operationDuration) opMgr.recordCancelMetricLocked(obj, createKey, operationDuration)
} }
// check if we have a CreateSnapshotAndReady operation pending for this // check if we have a CreateSnapshotAndReady operation pending for this
@@ -239,7 +239,7 @@ func (opMgr *operationMetricsManager) RecordMetrics(opKey OperationKey, opStatus
obj, exists = opMgr.cache[createAndReadyKey] obj, exists = opMgr.cache[createAndReadyKey]
if exists { if exists {
// record a cancel metric if found // record a cancel metric if found
opMgr.recordCancelMetric(obj, createAndReadyKey, operationDuration) opMgr.recordCancelMetricLocked(obj, createAndReadyKey, operationDuration)
} }
} }
@@ -248,9 +248,8 @@ func (opMgr *operationMetricsManager) RecordMetrics(opKey OperationKey, opStatus
} }
// recordCancelMetric records a metric for a create operation that hasn't finished // recordCancelMetric records a metric for a create operation that hasn't finished
func (opMgr *operationMetricsManager) recordCancelMetric(val OperationValue, key OperationKey, duration float64) { // This function must be called with opMgr mutex locked (to prevent recursive locks).
opMgr.mu.Lock() func (opMgr *operationMetricsManager) recordCancelMetricLocked(val OperationValue, key OperationKey, duration float64) {
defer opMgr.mu.Unlock()
// record a cancel metric if found // record a cancel metric if found
opMgr.opLatencyMetrics.WithLabelValues( opMgr.opLatencyMetrics.WithLabelValues(