From e7bc17882985804a69447e30b5050b4be995a8c2 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Fri, 18 Nov 2016 14:15:08 -0800 Subject: [PATCH] Revert "Add fast-path for Listing with ResourceVersion=0" --- pkg/storage/watch_cache.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkg/storage/watch_cache.go b/pkg/storage/watch_cache.go index 767899a2f9e..54c1ccd8fd1 100644 --- a/pkg/storage/watch_cache.go +++ b/pkg/storage/watch_cache.go @@ -283,13 +283,10 @@ func (w *watchCache) waitUntilFreshAndBlock(resourceVersion uint64, trace *util. // WaitUntilFreshAndList returns list of pointers to objects. 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. - if resourceVersion != 0 { - err := w.waitUntilFreshAndBlock(resourceVersion, trace) - defer w.RUnlock() - if err != nil { - return nil, 0, err - } + err := w.waitUntilFreshAndBlock(resourceVersion, trace) + defer w.RUnlock() + if err != nil { + return nil, 0, err } return w.store.List(), w.resourceVersion, nil }