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

storage: Implement TestWatchFromZero for cacher

Browse Source 
There exists a storage test to test for rv=0 and production
of ADDED events. This commit adapts the test to be used for
the watch cache as well.

Signed-off-by: Madhav Jivrajani <madhav.jiv@gmail.com>
This commit is contained in:
Madhav Jivrajani 2023-05-30 19:46:07 +05:30
parent 7935006af2
commit 4d85a1f00c
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
staging/src/k8s.io/apiserver/pkg/storage/testing/watcher_tests.go
View File

@ -192,8 +192,10 @@ func testWatch(ctx context.Context, t *testing.T, store storage.Interface, recur
} }
// RunTestWatchFromZero tests that // RunTestWatchFromZero tests that
// - watch from 0 should sync up and grab the object added before // - watch from 0 should sync up and grab the object added before
// - watch from 0 is able to return events for objects whose previous version has been compacted // - For testing with etcd, watch from 0 is able to return events for objects
// whose previous version has been compacted. If testing with cacher, we
// expect compaction to be nil.
func RunTestWatchFromZero(ctx context.Context, t *testing.T, store storage.Interface, compaction Compaction) { func RunTestWatchFromZero(ctx context.Context, t *testing.T, store storage.Interface, compaction Compaction) {
key, storedObj := testPropagateStore(ctx, t, store, &example.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "test-ns"}}) key, storedObj := testPropagateStore(ctx, t, store, &example.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "test-ns"}})
@ -202,7 +204,6 @@ func RunTestWatchFromZero(ctx context.Context, t *testing.T, store storage.Inter
t.Fatalf("Watch failed: %v", err) t.Fatalf("Watch failed: %v", err)
} }
testCheckResult(t, watch.Added, w, storedObj) testCheckResult(t, watch.Added, w, storedObj)
w.Stop()
// Update // Update
out := &example.Pod{} out := &example.Pod{}
@ -214,14 +215,24 @@ func RunTestWatchFromZero(ctx context.Context, t *testing.T, store storage.Inter
t.Fatalf("GuaranteedUpdate failed: %v", err) t.Fatalf("GuaranteedUpdate failed: %v", err)
} }
// Check that we receive a modified watch event. This check also
// indirectly ensures that the cache is synced. This is important
// when testing with the Cacher since we may have to allow for slow
// processing by allowing updates to propagate to the watch cache.
// This allows for that.
testCheckResult(t, watch.Modified, w, out)
w.Stop()
// Make sure when we watch from 0 we receive an ADDED event // Make sure when we watch from 0 we receive an ADDED event
w, err = store.Watch(ctx, key, storage.ListOptions{ResourceVersion: "0", Predicate: storage.Everything}) w, err = store.Watch(ctx, key, storage.ListOptions{ResourceVersion: "0", Predicate: storage.Everything})
if err != nil { if err != nil {
t.Fatalf("Watch failed: %v", err) t.Fatalf("Watch failed: %v", err)
} }
testCheckResult(t, watch.Added, w, out) testCheckResult(t, watch.Added, w, out)
w.Stop() w.Stop()
// Compact previous versions
if compaction == nil { if compaction == nil {
t.Skip("compaction callback not provided") t.Skip("compaction callback not provided")
} }

4
staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go
View File

@ -337,7 +337,9 @@ func TestWatch(t *testing.T) {
} }
func TestWatchFromZero(t *testing.T) { func TestWatchFromZero(t *testing.T) {
// TODO(#109831): Enable use of this test and run it. ctx, cacher, terminate := testSetup(t)
t.Cleanup(terminate)
storagetesting.RunTestWatchFromZero(ctx, t, cacher, nil)
} }
func TestDeleteTriggerWatch(t *testing.T) { func TestDeleteTriggerWatch(t *testing.T) {