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

Merge pull request #129852 from p0lyn0mial/upstream-clock-test-cache

Browse Source 
cacher: decrease the running time of TestConsistentReadFallback
This commit is contained in:
Kubernetes Prow Robot 2025-02-17 02:08:21 -08:00 committed by GitHub
commit e279ae4335
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go
View File

@ -61,7 +61,7 @@ import (
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
) )
func newTestCacherWithoutSyncing(s storage.Interface) (*Cacher, storage.Versioner, error) { func newTestCacherWithoutSyncing(s storage.Interface, c clock.WithTicker) (*Cacher, storage.Versioner, error) {
prefix := "pods" prefix := "pods"
config := Config{ config := Config{
Storage: s, Storage: s,
@ -85,7 +85,7 @@ func newTestCacherWithoutSyncing(s storage.Interface) (*Cacher, storage.Versione
NewFunc: func() runtime.Object { return &example.Pod{} }, NewFunc: func() runtime.Object { return &example.Pod{} },
NewListFunc: func() runtime.Object { return &example.PodList{} }, NewListFunc: func() runtime.Object { return &example.PodList{} },
Codec: codecs.LegacyCodec(examplev1.SchemeGroupVersion), Codec: codecs.LegacyCodec(examplev1.SchemeGroupVersion),
Clock: clock.RealClock{}, Clock: c,
} }
cacher, err := NewCacherFromConfig(config) cacher, err := NewCacherFromConfig(config)
@ -93,7 +93,7 @@ func newTestCacherWithoutSyncing(s storage.Interface) (*Cacher, storage.Versione
} }
func newTestCacher(s storage.Interface) (*Cacher, storage.Versioner, error) { func newTestCacher(s storage.Interface) (*Cacher, storage.Versioner, error) {
cacher, versioner, err := newTestCacherWithoutSyncing(s) cacher, versioner, err := newTestCacherWithoutSyncing(s, clock.RealClock{})
if err != nil { if err != nil {
return nil, versioner, err return nil, versioner, err
} }
@ -435,17 +435,15 @@ apiserver_watch_cache_consistent_read_total{fallback="true", resource="pods", su
podList.ResourceVersion = tc.watchCacheRV podList.ResourceVersion = tc.watchCacheRV
return nil return nil
} }
// TODO: Use fake clock for this test to reduce execution time. c := testingclock.NewFakeClock(time.Now())
cacher, _, err := newTestCacher(backingStorage) cacher, _, err := newTestCacherWithoutSyncing(backingStorage, c)
if err != nil { if err != nil {
t.Fatalf("Couldn't create cacher: %v", err) t.Fatalf("Couldn't create cacher: %v", err)
} }
defer cacher.Stop() defer cacher.Stop()
proxy := NewCacheProxy(cacher, backingStorage) proxy := NewCacheProxy(cacher, backingStorage)
if !utilfeature.DefaultFeatureGate.Enabled(features.ResilientWatchCacheInitialization) { if err := cacher.ready.wait(context.Background()); err != nil {
if err := cacher.ready.wait(context.Background()); err != nil { t.Fatalf("unexpected error waiting for the cache to be ready")
t.Fatalf("unexpected error waiting for the cache to be ready")
}
} }
if fmt.Sprintf("%d", cacher.watchCache.resourceVersion) != tc.watchCacheRV { if fmt.Sprintf("%d", cacher.watchCache.resourceVersion) != tc.watchCacheRV {
@ -466,8 +464,28 @@ apiserver_watch_cache_consistent_read_total{fallback="true", resource="pods", su
return nil return nil
} }
result := &example.PodList{} result := &example.PodList{}
ctx, clockStepCancelFn := context.WithTimeout(context.TODO(), time.Minute)
defer clockStepCancelFn()
if tc.expectBlock {
go func(ctx context.Context) {
for {
select {
case <-ctx.Done():
return
default:
if c.HasWaiters() {
c.Step(blockTimeout)
}
time.Sleep(time.Millisecond)
}
}
}(ctx)
}
start := cacher.clock.Now() start := cacher.clock.Now()
err = proxy.GetList(context.TODO(), "pods/ns", storage.ListOptions{ResourceVersion: ""}, result) err = proxy.GetList(context.TODO(), "pods/ns", storage.ListOptions{ResourceVersion: ""}, result)
clockStepCancelFn()
duration := cacher.clock.Since(start) duration := cacher.clock.Since(start)
if (err != nil) != tc.expectError { if (err != nil) != tc.expectError {
t.Fatalf("Unexpected error err: %v", err) t.Fatalf("Unexpected error err: %v", err)
@ -605,7 +623,7 @@ func TestTooManyRequestsNotReturned(t *testing.T) {
dummyErr := fmt.Errorf("dummy") dummyErr := fmt.Errorf("dummy")
backingStorage := &dummyStorage{err: dummyErr} backingStorage := &dummyStorage{err: dummyErr}
cacher, _, err := newTestCacherWithoutSyncing(backingStorage) cacher, _, err := newTestCacherWithoutSyncing(backingStorage, clock.RealClock{})
if err != nil { if err != nil {
t.Fatalf("Couldn't create cacher: %v", err) t.Fatalf("Couldn't create cacher: %v", err)
} }
@ -732,7 +750,7 @@ func TestWatchNotHangingOnStartupFailure(t *testing.T) {
// constantly failing lists to the underlying storage. // constantly failing lists to the underlying storage.
dummyErr := fmt.Errorf("dummy") dummyErr := fmt.Errorf("dummy")
backingStorage := &dummyStorage{err: dummyErr} backingStorage := &dummyStorage{err: dummyErr}
cacher, _, err := newTestCacherWithoutSyncing(backingStorage) cacher, _, err := newTestCacherWithoutSyncing(backingStorage, clock.RealClock{})
if err != nil { if err != nil {
t.Fatalf("Couldn't create cacher: %v", err) t.Fatalf("Couldn't create cacher: %v", err)
} }