scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20697 from wojtek-t/fix_lock_in_watch_cacher

Browse Source 
Fix deadlock in watch cache
This commit is contained in:
Daniel Smith
2016-02-05 00:03:38 -08:00
parent 2e7993e057 d3639aff73
commit 67065b8460
1 changed files with 1 additions and 1 deletions
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
} }