github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37085 from gmarek/rv

Browse Source 
Automatic merge from submit-queue

Add fast-path for Listing with ResourceVersion=0

We slightly change the behavior, but we keep the current contract, so release note is not needed.

cc @saad-ali
This commit is contained in:
Kubernetes Submit Queue 2016-11-18 09:45:11 -08:00 committed by GitHub
commit 9d4f94dcec
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/storage/watch_cache.go
View File

@ -283,10 +283,13 @@ 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) {
err := w.waitUntilFreshAndBlock(resourceVersion, trace) // If resourceVersion == 0 we'll return the data that we currently have in cache.
defer w.RUnlock() if resourceVersion != 0 {
if err != nil { err := w.waitUntilFreshAndBlock(resourceVersion, trace)
return nil, 0, err defer w.RUnlock()
if err != nil {
return nil, 0, err
}
} }
return w.store.List(), w.resourceVersion, nil return w.store.List(), w.resourceVersion, nil
} }