Merge pull request #37085 from gmarek/rv

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

Merge pull request #37085 from gmarek/rv
9d4f94dc · Kubernetes Submit Queue · GitHub · c02df2f6 · e1542300 · 9d4f94dc
Commit 9d4f94dc authored Nov 18, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

watch_cache.go pkg/storage/watch_cache.go +7 -4

No files found.
--- a/pkg/storage/watch_cache.go
+++ b/pkg/storage/watch_cache.go
@@ -283,10 +283,13 @@ func (w *watchCache) waitUntilFreshAndBlock(resourceVersion uint64, trace *util.
 // WaitUntilFreshAndList returns list of pointers to <storeElement> objects.
 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
 }