Commit 418a1d30 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #34935 from wojtek-t/addtional_tracing_step

Automatic merge from submit-queue Extend tracing in watchCache
parents fce3b953 6d06a384
...@@ -223,6 +223,9 @@ func (w *watchCache) WaitUntilFreshAndList(resourceVersion uint64, trace *util.T ...@@ -223,6 +223,9 @@ func (w *watchCache) WaitUntilFreshAndList(resourceVersion uint64, trace *util.T
w.RLock() w.RLock()
defer w.RUnlock() defer w.RUnlock()
if trace != nil {
trace.Step("watchCache locked acquired")
}
for w.resourceVersion < resourceVersion { for w.resourceVersion < resourceVersion {
if w.clock.Since(startTime) >= MaximumListWait { if w.clock.Since(startTime) >= MaximumListWait {
return nil, 0, fmt.Errorf("time limit exceeded while waiting for resource version %v (current value: %v)", resourceVersion, w.resourceVersion) return nil, 0, fmt.Errorf("time limit exceeded while waiting for resource version %v (current value: %v)", resourceVersion, w.resourceVersion)
...@@ -230,7 +233,7 @@ func (w *watchCache) WaitUntilFreshAndList(resourceVersion uint64, trace *util.T ...@@ -230,7 +233,7 @@ func (w *watchCache) WaitUntilFreshAndList(resourceVersion uint64, trace *util.T
w.cond.Wait() w.cond.Wait()
} }
if trace != nil { if trace != nil {
trace.Step("Cache is fresh enough") trace.Step("watchCache fresh enough")
} }
return w.store.List(), w.resourceVersion, nil return w.store.List(), w.resourceVersion, nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment