Skip to content

Commit 74c7b98

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#91822 from gongguan/rm-capacity
remove deprecated cacher CacheCapacity config
2 parents 7e69068 + 12c8381 commit 74c7b98

File tree

5 files changed

+28
-37
lines changed

5 files changed

+28
-37
lines changed

‎staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,6 @@ func newTestGenericStoreRegistry(t *testing.T, scheme *runtime.Scheme, hasCacheE
16121612
}
16131613
if hasCacheEnabled {
16141614
config := cacherstorage.Config{
1615-
CacheCapacity: 10,
16161615
Storage: s,
16171616
Versioner: etcd3.APIObjectVersioner{},
16181617
ResourcePrefix: podPrefix,

‎staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ const (
6060

6161
// Config contains the configuration for a given Cache.
6262
type Config struct {
63-
// Maximum size of the history cached in memory.
64-
//
65-
// DEPRECATED: Cache capacity is dynamic and this field is no longer used.
66-
CacheCapacity int
67-
6863
// An underlying storage.Interface.
6964
Storage storage.Interface
7065

‎staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,9 @@ func init() {
259259
utilruntime.Must(examplev1.AddToScheme(scheme))
260260
}
261261

262-
func newTestCacher(s storage.Interface, cap int) (*Cacher, storage.Versioner, error) {
262+
func newTestCacher(s storage.Interface) (*Cacher, storage.Versioner, error) {
263263
prefix := "pods"
264264
config := Config{
265-
CacheCapacity: cap,
266265
Storage: s,
267266
Versioner: testVersioner{},
268267
ResourcePrefix: prefix,
@@ -332,7 +331,7 @@ func (d *dummyStorage) Count(_ string) (int64, error) {
332331

333332
func TestListCacheBypass(t *testing.T) {
334333
backingStorage := &dummyStorage{}
335-
cacher, _, err := newTestCacher(backingStorage, 0)
334+
cacher, _, err := newTestCacher(backingStorage)
336335
if err != nil {
337336
t.Fatalf("Couldn't create cacher: %v", err)
338337
}
@@ -367,7 +366,7 @@ func TestListCacheBypass(t *testing.T) {
367366

368367
func TestGetToListCacheBypass(t *testing.T) {
369368
backingStorage := &dummyStorage{}
370-
cacher, _, err := newTestCacher(backingStorage, 0)
369+
cacher, _, err := newTestCacher(backingStorage)
371370
if err != nil {
372371
t.Fatalf("Couldn't create cacher: %v", err)
373372
}
@@ -402,7 +401,7 @@ func TestGetToListCacheBypass(t *testing.T) {
402401

403402
func TestGetCacheBypass(t *testing.T) {
404403
backingStorage := &dummyStorage{}
405-
cacher, _, err := newTestCacher(backingStorage, 1)
404+
cacher, _, err := newTestCacher(backingStorage)
406405
if err != nil {
407406
t.Fatalf("Couldn't create cacher: %v", err)
408407
}
@@ -434,7 +433,7 @@ func TestGetCacheBypass(t *testing.T) {
434433

435434
func TestWatcherNotGoingBackInTime(t *testing.T) {
436435
backingStorage := &dummyStorage{}
437-
cacher, _, err := newTestCacher(backingStorage, 1000)
436+
cacher, _, err := newTestCacher(backingStorage)
438437
if err != nil {
439438
t.Fatalf("Couldn't create cacher: %v", err)
440439
}
@@ -558,7 +557,7 @@ func TestCacheWatcherStoppedInAnotherGoroutine(t *testing.T) {
558557

559558
func TestCacheWatcherStoppedOnDestroy(t *testing.T) {
560559
backingStorage := &dummyStorage{}
561-
cacher, _, err := newTestCacher(backingStorage, 1000)
560+
cacher, _, err := newTestCacher(backingStorage)
562561
if err != nil {
563562
t.Fatalf("Couldn't create cacher: %v", err)
564563
}
@@ -640,7 +639,7 @@ func TestTimeBucketWatchersBasic(t *testing.T) {
640639
func TestCacherNoLeakWithMultipleWatchers(t *testing.T) {
641640
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchBookmark, true)()
642641
backingStorage := &dummyStorage{}
643-
cacher, _, err := newTestCacher(backingStorage, 1000)
642+
cacher, _, err := newTestCacher(backingStorage)
644643
if err != nil {
645644
t.Fatalf("Couldn't create cacher: %v", err)
646645
}
@@ -708,7 +707,7 @@ func TestCacherNoLeakWithMultipleWatchers(t *testing.T) {
708707

709708
func testCacherSendBookmarkEvents(t *testing.T, allowWatchBookmarks, expectedBookmarks bool) {
710709
backingStorage := &dummyStorage{}
711-
cacher, _, err := newTestCacher(backingStorage, 1000)
710+
cacher, _, err := newTestCacher(backingStorage)
712711
if err != nil {
713712
t.Fatalf("Couldn't create cacher: %v", err)
714713
}
@@ -796,7 +795,7 @@ func TestCacherSendBookmarkEvents(t *testing.T) {
796795

797796
func TestCacherSendsMultipleWatchBookmarks(t *testing.T) {
798797
backingStorage := &dummyStorage{}
799-
cacher, _, err := newTestCacher(backingStorage, 1000)
798+
cacher, _, err := newTestCacher(backingStorage)
800799
if err != nil {
801800
t.Fatalf("Couldn't create cacher: %v", err)
802801
}
@@ -868,7 +867,7 @@ func TestCacherSendsMultipleWatchBookmarks(t *testing.T) {
868867
func TestDispatchingBookmarkEventsWithConcurrentStop(t *testing.T) {
869868
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchBookmark, true)()
870869
backingStorage := &dummyStorage{}
871-
cacher, _, err := newTestCacher(backingStorage, 1000)
870+
cacher, _, err := newTestCacher(backingStorage)
872871
if err != nil {
873872
t.Fatalf("Couldn't create cacher: %v", err)
874873
}
@@ -941,7 +940,7 @@ func TestDispatchingBookmarkEventsWithConcurrentStop(t *testing.T) {
941940

942941
func TestDispatchEventWillNotBeBlockedByTimedOutWatcher(t *testing.T) {
943942
backingStorage := &dummyStorage{}
944-
cacher, _, err := newTestCacher(backingStorage, 1000)
943+
cacher, _, err := newTestCacher(backingStorage)
945944
if err != nil {
946945
t.Fatalf("Couldn't create cacher: %v", err)
947946
}
@@ -1040,7 +1039,7 @@ func verifyEvents(t *testing.T, w watch.Interface, events []watch.Event) {
10401039

10411040
func TestCachingDeleteEvents(t *testing.T) {
10421041
backingStorage := &dummyStorage{}
1043-
cacher, _, err := newTestCacher(backingStorage, 1000)
1042+
cacher, _, err := newTestCacher(backingStorage)
10441043
if err != nil {
10451044
t.Fatalf("Couldn't create cacher: %v", err)
10461045
}
@@ -1120,7 +1119,7 @@ func TestCachingDeleteEvents(t *testing.T) {
11201119

11211120
func testCachingObjects(t *testing.T, watchersCount int) {
11221121
backingStorage := &dummyStorage{}
1123-
cacher, _, err := newTestCacher(backingStorage, 10)
1122+
cacher, _, err := newTestCacher(backingStorage)
11241123
if err != nil {
11251124
t.Fatalf("Couldn't create cacher: %v", err)
11261125
}

‎staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ const (
5353
eventFreshDuration = 75 * time.Second
5454

5555
// defaultLowerBoundCapacity is a default value for event cache capacity's lower bound.
56-
// 100 is minimum in NewHeuristicWatchCacheSizes.
5756
// TODO: Figure out, to what value we can decreased it.
5857
defaultLowerBoundCapacity = 100
5958

‎staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,14 @@ func newEtcdTestStorage(t *testing.T, prefix string) (*etcd3testing.EtcdTestServ
105105
return server, storage
106106
}
107107

108-
func newTestCacher(s storage.Interface, cap int) (*cacherstorage.Cacher, storage.Versioner, error) {
109-
return newTestCacherWithClock(s, cap, clock.RealClock{})
108+
func newTestCacher(s storage.Interface) (*cacherstorage.Cacher, storage.Versioner, error) {
109+
return newTestCacherWithClock(s, clock.RealClock{})
110110
}
111111

112-
func newTestCacherWithClock(s storage.Interface, cap int, clock clock.Clock) (*cacherstorage.Cacher, storage.Versioner, error) {
112+
func newTestCacherWithClock(s storage.Interface, clock clock.Clock) (*cacherstorage.Cacher, storage.Versioner, error) {
113113
prefix := "pods"
114114
v := etcd3.APIObjectVersioner{}
115115
config := cacherstorage.Config{
116-
CacheCapacity: cap,
117116
Storage: s,
118117
Versioner: v,
119118
ResourcePrefix: prefix,
@@ -160,7 +159,7 @@ func updatePod(t *testing.T, s storage.Interface, obj, old *example.Pod) *exampl
160159
func TestGet(t *testing.T) {
161160
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
162161
defer server.Terminate(t)
163-
cacher, _, err := newTestCacher(etcdStorage, 10)
162+
cacher, _, err := newTestCacher(etcdStorage)
164163
if err != nil {
165164
t.Fatalf("Couldn't create cacher: %v", err)
166165
}
@@ -194,7 +193,7 @@ func TestGet(t *testing.T) {
194193
func TestGetToList(t *testing.T) {
195194
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
196195
defer server.Terminate(t)
197-
cacher, _, err := newTestCacher(etcdStorage, 10)
196+
cacher, _, err := newTestCacher(etcdStorage)
198197
if err != nil {
199198
t.Fatalf("Couldn't create cacher: %v", err)
200199
}
@@ -253,7 +252,7 @@ func TestGetToList(t *testing.T) {
253252
func TestList(t *testing.T) {
254253
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
255254
defer server.Terminate(t)
256-
cacher, _, err := newTestCacher(etcdStorage, 10)
255+
cacher, _, err := newTestCacher(etcdStorage)
257256
if err != nil {
258257
t.Fatalf("Couldn't create cacher: %v", err)
259258
}
@@ -339,7 +338,7 @@ func TestList(t *testing.T) {
339338
func TestTooLargeResourceVersionList(t *testing.T) {
340339
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
341340
defer server.Terminate(t)
342-
cacher, v, err := newTestCacher(etcdStorage, 10)
341+
cacher, v, err := newTestCacher(etcdStorage)
343342
if err != nil {
344343
t.Fatalf("Couldn't create cacher: %v", err)
345344
}
@@ -406,7 +405,7 @@ func TestWatch(t *testing.T) {
406405
etcdStorage = &injectListError{errors: 1, Interface: etcdStorage}
407406
defer server.Terminate(t)
408407
fakeClock := clock.NewFakeClock(time.Now())
409-
cacher, _, err := newTestCacherWithClock(etcdStorage, watchCacheDefaultCapacity, fakeClock)
408+
cacher, _, err := newTestCacherWithClock(etcdStorage, fakeClock)
410409
if err != nil {
411410
t.Fatalf("Couldn't create cacher: %v", err)
412411
}
@@ -493,7 +492,7 @@ func TestWatch(t *testing.T) {
493492
func TestWatcherTimeout(t *testing.T) {
494493
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
495494
defer server.Terminate(t)
496-
cacher, _, err := newTestCacher(etcdStorage, 10)
495+
cacher, _, err := newTestCacher(etcdStorage)
497496
if err != nil {
498497
t.Fatalf("Couldn't create cacher: %v", err)
499498
}
@@ -538,7 +537,7 @@ func TestWatcherTimeout(t *testing.T) {
538537
func TestFiltering(t *testing.T) {
539538
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
540539
defer server.Terminate(t)
541-
cacher, _, err := newTestCacher(etcdStorage, 10)
540+
cacher, _, err := newTestCacher(etcdStorage)
542541
if err != nil {
543542
t.Fatalf("Couldn't create cacher: %v", err)
544543
}
@@ -603,7 +602,7 @@ func TestFiltering(t *testing.T) {
603602
func TestStartingResourceVersion(t *testing.T) {
604603
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
605604
defer server.Terminate(t)
606-
cacher, v, err := newTestCacher(etcdStorage, 10)
605+
cacher, v, err := newTestCacher(etcdStorage)
607606
if err != nil {
608607
t.Fatalf("Couldn't create cacher: %v", err)
609608
}
@@ -668,7 +667,7 @@ func TestEmptyWatchEventCache(t *testing.T) {
668667

669668
fooCreated := updatePod(t, etcdStorage, makeTestPod("foo"), nil)
670669

671-
cacher, v, err := newTestCacher(etcdStorage, 10)
670+
cacher, v, err := newTestCacher(etcdStorage)
672671
if err != nil {
673672
t.Fatalf("Couldn't create cacher: %v", err)
674673
}
@@ -725,7 +724,7 @@ func TestEmptyWatchEventCache(t *testing.T) {
725724
func TestRandomWatchDeliver(t *testing.T) {
726725
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
727726
defer server.Terminate(t)
728-
cacher, v, err := newTestCacher(etcdStorage, 10)
727+
cacher, v, err := newTestCacher(etcdStorage)
729728
if err != nil {
730729
t.Fatalf("Couldn't create cacher: %v", err)
731730
}
@@ -858,7 +857,7 @@ func TestWatchDispatchBookmarkEvents(t *testing.T) {
858857

859858
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
860859
defer server.Terminate(t)
861-
cacher, v, err := newTestCacher(etcdStorage, 10)
860+
cacher, v, err := newTestCacher(etcdStorage)
862861
if err != nil {
863862
t.Fatalf("Couldn't create cacher: %v", err)
864863
}
@@ -923,7 +922,7 @@ func TestWatchBookmarksWithCorrectResourceVersion(t *testing.T) {
923922

924923
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
925924
defer server.Terminate(t)
926-
cacher, v, err := newTestCacher(etcdStorage, 10)
925+
cacher, v, err := newTestCacher(etcdStorage)
927926
if err != nil {
928927
t.Fatalf("Couldn't create cacher: %v", err)
929928
}

0 commit comments

Comments
 (0)