From 12c838136b09005e0cbc831096643195ef24cb89 Mon Sep 17 00:00:00 2001 From: gongguan Date: Fri, 5 Jun 2020 21:34:36 +0800 Subject: [PATCH] remove deprecated cacher CacheCapacity config --- .../registry/generic/registry/store_test.go | 1 - .../apiserver/pkg/storage/cacher/cacher.go | 5 --- .../storage/cacher/cacher_whitebox_test.go | 27 ++++++++-------- .../pkg/storage/cacher/watch_cache.go | 1 - .../pkg/storage/tests/cacher_test.go | 31 +++++++++---------- 5 files changed, 28 insertions(+), 37 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go index 00e6017f0ec..fd1979bb625 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go @@ -1612,7 +1612,6 @@ func newTestGenericStoreRegistry(t *testing.T, scheme *runtime.Scheme, hasCacheE } if hasCacheEnabled { config := cacherstorage.Config{ - CacheCapacity: 10, Storage: s, Versioner: etcd3.APIObjectVersioner{}, ResourcePrefix: podPrefix, diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go index 6cccf80c088..6dbb73cf2af 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go @@ -60,11 +60,6 @@ const ( // Config contains the configuration for a given Cache. type Config struct { - // Maximum size of the history cached in memory. - // - // DEPRECATED: Cache capacity is dynamic and this field is no longer used. - CacheCapacity int - // An underlying storage.Interface. Storage storage.Interface diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go index 41199668085..c13c1140672 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go @@ -259,10 +259,9 @@ func init() { utilruntime.Must(examplev1.AddToScheme(scheme)) } -func newTestCacher(s storage.Interface, cap int) (*Cacher, storage.Versioner, error) { +func newTestCacher(s storage.Interface) (*Cacher, storage.Versioner, error) { prefix := "pods" config := Config{ - CacheCapacity: cap, Storage: s, Versioner: testVersioner{}, ResourcePrefix: prefix, @@ -332,7 +331,7 @@ func (d *dummyStorage) Count(_ string) (int64, error) { func TestListCacheBypass(t *testing.T) { backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 0) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -367,7 +366,7 @@ func TestListCacheBypass(t *testing.T) { func TestGetToListCacheBypass(t *testing.T) { backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 0) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -402,7 +401,7 @@ func TestGetToListCacheBypass(t *testing.T) { func TestGetCacheBypass(t *testing.T) { backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 1) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -434,7 +433,7 @@ func TestGetCacheBypass(t *testing.T) { func TestWatcherNotGoingBackInTime(t *testing.T) { backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 1000) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -558,7 +557,7 @@ func TestCacheWatcherStoppedInAnotherGoroutine(t *testing.T) { func TestCacheWatcherStoppedOnDestroy(t *testing.T) { backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 1000) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -640,7 +639,7 @@ func TestTimeBucketWatchersBasic(t *testing.T) { func TestCacherNoLeakWithMultipleWatchers(t *testing.T) { defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchBookmark, true)() backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 1000) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -708,7 +707,7 @@ func TestCacherNoLeakWithMultipleWatchers(t *testing.T) { func testCacherSendBookmarkEvents(t *testing.T, allowWatchBookmarks, expectedBookmarks bool) { backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 1000) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -796,7 +795,7 @@ func TestCacherSendBookmarkEvents(t *testing.T) { func TestCacherSendsMultipleWatchBookmarks(t *testing.T) { backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 1000) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -868,7 +867,7 @@ func TestCacherSendsMultipleWatchBookmarks(t *testing.T) { func TestDispatchingBookmarkEventsWithConcurrentStop(t *testing.T) { defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchBookmark, true)() backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 1000) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -941,7 +940,7 @@ func TestDispatchingBookmarkEventsWithConcurrentStop(t *testing.T) { func TestDispatchEventWillNotBeBlockedByTimedOutWatcher(t *testing.T) { backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 1000) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -1040,7 +1039,7 @@ func verifyEvents(t *testing.T, w watch.Interface, events []watch.Event) { func TestCachingDeleteEvents(t *testing.T) { backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 1000) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -1120,7 +1119,7 @@ func TestCachingDeleteEvents(t *testing.T) { func testCachingObjects(t *testing.T, watchersCount int) { backingStorage := &dummyStorage{} - cacher, _, err := newTestCacher(backingStorage, 10) + cacher, _, err := newTestCacher(backingStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache.go index 7ba7d475b3e..1e91733e143 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache.go @@ -53,7 +53,6 @@ const ( eventFreshDuration = 75 * time.Second // defaultLowerBoundCapacity is a default value for event cache capacity's lower bound. - // 100 is minimum in NewHeuristicWatchCacheSizes. // TODO: Figure out, to what value we can decreased it. defaultLowerBoundCapacity = 100 diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go index 18a7f674157..b9de03e15cc 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go @@ -105,15 +105,14 @@ func newEtcdTestStorage(t *testing.T, prefix string) (*etcd3testing.EtcdTestServ return server, storage } -func newTestCacher(s storage.Interface, cap int) (*cacherstorage.Cacher, storage.Versioner, error) { - return newTestCacherWithClock(s, cap, clock.RealClock{}) +func newTestCacher(s storage.Interface) (*cacherstorage.Cacher, storage.Versioner, error) { + return newTestCacherWithClock(s, clock.RealClock{}) } -func newTestCacherWithClock(s storage.Interface, cap int, clock clock.Clock) (*cacherstorage.Cacher, storage.Versioner, error) { +func newTestCacherWithClock(s storage.Interface, clock clock.Clock) (*cacherstorage.Cacher, storage.Versioner, error) { prefix := "pods" v := etcd3.APIObjectVersioner{} config := cacherstorage.Config{ - CacheCapacity: cap, Storage: s, Versioner: v, ResourcePrefix: prefix, @@ -160,7 +159,7 @@ func updatePod(t *testing.T, s storage.Interface, obj, old *example.Pod) *exampl func TestGet(t *testing.T) { server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) - cacher, _, err := newTestCacher(etcdStorage, 10) + cacher, _, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -194,7 +193,7 @@ func TestGet(t *testing.T) { func TestGetToList(t *testing.T) { server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) - cacher, _, err := newTestCacher(etcdStorage, 10) + cacher, _, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -253,7 +252,7 @@ func TestGetToList(t *testing.T) { func TestList(t *testing.T) { server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) - cacher, _, err := newTestCacher(etcdStorage, 10) + cacher, _, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -339,7 +338,7 @@ func TestList(t *testing.T) { func TestTooLargeResourceVersionList(t *testing.T) { server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) - cacher, v, err := newTestCacher(etcdStorage, 10) + cacher, v, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -406,7 +405,7 @@ func TestWatch(t *testing.T) { etcdStorage = &injectListError{errors: 1, Interface: etcdStorage} defer server.Terminate(t) fakeClock := clock.NewFakeClock(time.Now()) - cacher, _, err := newTestCacherWithClock(etcdStorage, watchCacheDefaultCapacity, fakeClock) + cacher, _, err := newTestCacherWithClock(etcdStorage, fakeClock) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -493,7 +492,7 @@ func TestWatch(t *testing.T) { func TestWatcherTimeout(t *testing.T) { server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) - cacher, _, err := newTestCacher(etcdStorage, 10) + cacher, _, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -538,7 +537,7 @@ func TestWatcherTimeout(t *testing.T) { func TestFiltering(t *testing.T) { server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) - cacher, _, err := newTestCacher(etcdStorage, 10) + cacher, _, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -603,7 +602,7 @@ func TestFiltering(t *testing.T) { func TestStartingResourceVersion(t *testing.T) { server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) - cacher, v, err := newTestCacher(etcdStorage, 10) + cacher, v, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -668,7 +667,7 @@ func TestEmptyWatchEventCache(t *testing.T) { fooCreated := updatePod(t, etcdStorage, makeTestPod("foo"), nil) - cacher, v, err := newTestCacher(etcdStorage, 10) + cacher, v, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -725,7 +724,7 @@ func TestEmptyWatchEventCache(t *testing.T) { func TestRandomWatchDeliver(t *testing.T) { server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) - cacher, v, err := newTestCacher(etcdStorage, 10) + cacher, v, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -858,7 +857,7 @@ func TestWatchDispatchBookmarkEvents(t *testing.T) { server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) - cacher, v, err := newTestCacher(etcdStorage, 10) + cacher, v, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) } @@ -923,7 +922,7 @@ func TestWatchBookmarksWithCorrectResourceVersion(t *testing.T) { server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) - cacher, v, err := newTestCacher(etcdStorage, 10) + cacher, v, err := newTestCacher(etcdStorage) if err != nil { t.Fatalf("Couldn't create cacher: %v", err) }