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

Merge pull request #37125 from kubernetes/revert-37085-rv

Browse Source 
Revert "Add fast-path for Listing with ResourceVersion=0"
This commit is contained in:
Antoine Pelisse
2016-11-18 14:16:38 -08:00
committed by GitHub
parent 38ec2974a2 e7bc178829
commit 8a27baeaf5
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/storage/watch_cache.go
View File

@@ -283,13 +283,10 @@ func (w *watchCache) waitUntilFreshAndBlock(resourceVersion uint64, trace *util.
// WaitUntilFreshAndList returns list of pointers to <storeElement> objects. // WaitUntilFreshAndList returns list of pointers to <storeElement> objects.
func (w *watchCache) WaitUntilFreshAndList(resourceVersion uint64, trace *util.Trace) ([]interface{}, uint64, error) { func (w *watchCache) WaitUntilFreshAndList(resourceVersion uint64, trace *util.Trace) ([]interface{}, uint64, error) {
// If resourceVersion == 0 we'll return the data that we currently have in cache. err := w.waitUntilFreshAndBlock(resourceVersion, trace)
if resourceVersion != 0 { defer w.RUnlock()
err := w.waitUntilFreshAndBlock(resourceVersion, trace) if err != nil {
defer w.RUnlock() return nil, 0, err
if err != nil {
return nil, 0, err
}
} }
return w.store.List(), w.resourceVersion, nil return w.store.List(), w.resourceVersion, nil
} }