kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor GetReads 

Kubernetes-commit: 8472e1bc13b0fa8aa3a67e5fcf2f13bfd7974cd3
This commit is contained in:
Wojciech Tyczyński 2022-10-26 11:30:32 +02:00 committed by Kubernetes Publisher
parent 6e21d2997b
commit dec6f492e8
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/storage/etcd3/store_test.go
View File

@ -273,13 +273,12 @@ func TestListContinuation(t *testing.T) {
t.Fatalf("No continuation token set")
}
storagetesting.ExpectNoDiff(t, "incorrect first page", []example.Pod{*preset[0].storedObj}, out.Items)
if reads := transformer.GetReads(); reads != 1 {
if reads := transformer.GetReadsAndReset(); reads != 1 {
t.Errorf("unexpected reads: %d", reads)
}
if recorder.reads != 1 {
t.Errorf("unexpected reads: %d", recorder.reads)
}
transformer.ResetReads()
recorder.resetReads()
continueFromSecondItem := out.Continue
@ -300,13 +299,12 @@ func TestListContinuation(t *testing.T) {
key, rv, err := storage.DecodeContinue(continueFromSecondItem, "/")
t.Logf("continue token was %d %s %v", rv, key, err)
storagetesting.ExpectNoDiff(t, "incorrect second page", []example.Pod{*preset[1].storedObj, *preset[2].storedObj}, out.Items)
if reads := transformer.GetReads(); reads != 2 {
if reads := transformer.GetReadsAndReset(); reads != 2 {
t.Errorf("unexpected reads: %d", reads)
}
if recorder.reads != 1 {
t.Errorf("unexpected reads: %d", recorder.reads)
}
transformer.ResetReads()
recorder.resetReads()
// limit, should get two more pages
@ -323,13 +321,12 @@ func TestListContinuation(t *testing.T) {
t.Fatalf("No continuation token set")
}
storagetesting.ExpectNoDiff(t, "incorrect second page", []example.Pod{*preset[1].storedObj}, out.Items)
if reads := transformer.GetReads(); reads != 1 {
if reads := transformer.GetReadsAndReset(); reads != 1 {
t.Errorf("unexpected reads: %d", reads)
}
if recorder.reads != 1 {
t.Errorf("unexpected reads: %d", recorder.reads)
}
transformer.ResetReads()
recorder.resetReads()
continueFromThirdItem := out.Continue
@ -347,7 +344,7 @@ func TestListContinuation(t *testing.T) {
t.Fatalf("Unexpected continuation token set")
}
storagetesting.ExpectNoDiff(t, "incorrect third page", []example.Pod{*preset[2].storedObj}, out.Items)
if reads := transformer.GetReads(); reads != 1 {
if reads := transformer.GetReadsAndReset(); reads != 1 {
t.Errorf("unexpected reads: %d", reads)
}
if recorder.reads != 1 {
@ -396,7 +393,7 @@ func TestListPaginationRareObject(t *testing.T) {
if len(out.Items) != 1 || !reflect.DeepEqual(&out.Items[0], pods[999]) {
t.Fatalf("Unexpected first page: %#v", out.Items)
}
if reads := transformer.GetReads(); reads != uint64(podCount) {
if reads := transformer.GetReadsAndReset(); reads != uint64(podCount) {
t.Errorf("unexpected reads: %d", reads)
}
// We expect that kube-apiserver will be increasing page sizes
@ -491,13 +488,12 @@ func TestListContinuationWithFilter(t *testing.T) {
t.Errorf("No continuation token set")
}
storagetesting.ExpectNoDiff(t, "incorrect first page", []example.Pod{*preset[0].storedObj, *preset[2].storedObj}, out.Items)
if reads := transformer.GetReads(); reads != 3 {
if reads := transformer.GetReadsAndReset(); reads != 3 {
t.Errorf("unexpected reads: %d", reads)
}
if recorder.reads != 2 {
t.Errorf("unexpected reads: %d", recorder.reads)
}
transformer.ResetReads()
recorder.resetReads()
// the rest of the test does not make sense if the previous call failed
@ -523,7 +519,7 @@ func TestListContinuationWithFilter(t *testing.T) {
t.Errorf("Unexpected continuation token set")
}
storagetesting.ExpectNoDiff(t, "incorrect second page", []example.Pod{*preset[3].storedObj}, out.Items)
if reads := transformer.GetReads(); reads != 1 {
if reads := transformer.GetReadsAndReset(); reads != 1 {
t.Errorf("unexpected reads: %d", reads)
}
if recorder.reads != 1 {

8
pkg/storage/testing/utils.go
View File

@ -232,10 +232,6 @@ func (p *PrefixTransformer) TransformToStorage(ctx context.Context, data []byte,
return data, p.err
}
func (p *PrefixTransformer) GetReads() uint64 {
return atomic.LoadUint64(&p.reads)
}
func (p *PrefixTransformer) ResetReads() {
atomic.StoreUint64(&p.reads, 0)
func (p *PrefixTransformer) GetReadsAndReset() uint64 {
return atomic.SwapUint64(&p.reads, 0)
}