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

Fix deadlock in watch cache

Browse Source
This commit is contained in:
Wojciech Tyczynski 2016-02-05 08:31:55 +01:00
parent 2e7993e057
commit d3639aff73
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/storage/watch_cache.go
View File

@ -220,13 +220,13 @@ func (w *watchCache) WaitUntilFreshAndList(resourceVersion uint64) ([]interface{
}() }()
w.RLock() w.RLock()
defer w.RUnlock()
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)
} }
w.cond.Wait() w.cond.Wait()
} }
defer w.RUnlock()
return w.store.List(), w.resourceVersion, nil return w.store.List(), w.resourceVersion, nil
} }