From 734be0c49f3d283ec086c9aef2dc63142b481c19 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 20 Jun 2017 13:22:07 +0200 Subject: [PATCH] Fix benchmarks to really test reverse order of the keys. --- .../pkg/storage/value/encrypt/aes/aes_test.go | 24 +++++++++---------- .../value/encrypt/secretbox/secretbox_test.go | 12 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/aes_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/aes_test.go index 167d6d8a984..cb87f27b574 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/aes_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/aes_test.go @@ -158,7 +158,7 @@ func BenchmarkGCMWrite_16_1024(b *testing.B) { benchmarkGCMWrite(b, 16, 1024) } func BenchmarkGCMWrite_32_1024(b *testing.B) { benchmarkGCMWrite(b, 32, 1024) } func BenchmarkGCMWrite_32_16384(b *testing.B) { benchmarkGCMWrite(b, 32, 16384) } -func benchmarkGCMRead(b *testing.B, keyLength int, valueLength int, stale bool) { +func benchmarkGCMRead(b *testing.B, keyLength int, valueLength int, expectStale bool) { block1, err := aes.NewCipher(bytes.Repeat([]byte("a"), keyLength)) if err != nil { b.Fatal(err) @@ -179,11 +179,11 @@ func benchmarkGCMRead(b *testing.B, keyLength int, valueLength int, stale bool) if err != nil { b.Fatal(err) } - // reverse the key order if stale - if stale { + // reverse the key order if expecting stale + if expectStale { p = value.NewPrefixTransformers(nil, - value.PrefixTransformer{Prefix: []byte("first:"), Transformer: NewGCMTransformer(block1)}, value.PrefixTransformer{Prefix: []byte("second:"), Transformer: NewGCMTransformer(block2)}, + value.PrefixTransformer{Prefix: []byte("first:"), Transformer: NewGCMTransformer(block1)}, ) } @@ -193,8 +193,8 @@ func benchmarkGCMRead(b *testing.B, keyLength int, valueLength int, stale bool) if err != nil { b.Fatal(err) } - if stale { - b.Fatalf("unexpected data: %t %q", stale, from) + if expectStale != stale { + b.Fatalf("unexpected data: %q, expect stale %t but got %t", from, expectStale, stale) } } b.StopTimer() @@ -234,7 +234,7 @@ func BenchmarkCBCRead_32_16384_Stale(b *testing.B) { benchmarkCBCRead(b, 32, 163 func BenchmarkCBCWrite_32_1024(b *testing.B) { benchmarkCBCWrite(b, 32, 1024) } func BenchmarkCBCWrite_32_16384(b *testing.B) { benchmarkCBCWrite(b, 32, 16384) } -func benchmarkCBCRead(b *testing.B, keyLength int, valueLength int, stale bool) { +func benchmarkCBCRead(b *testing.B, keyLength int, valueLength int, expectStale bool) { block1, err := aes.NewCipher(bytes.Repeat([]byte("a"), keyLength)) if err != nil { b.Fatal(err) @@ -255,11 +255,11 @@ func benchmarkCBCRead(b *testing.B, keyLength int, valueLength int, stale bool) if err != nil { b.Fatal(err) } - // reverse the key order if stale - if stale { + // reverse the key order if expecting stale + if expectStale { p = value.NewPrefixTransformers(nil, - value.PrefixTransformer{Prefix: []byte("first:"), Transformer: NewCBCTransformer(block1)}, value.PrefixTransformer{Prefix: []byte("second:"), Transformer: NewCBCTransformer(block2)}, + value.PrefixTransformer{Prefix: []byte("first:"), Transformer: NewCBCTransformer(block1)}, ) } @@ -269,8 +269,8 @@ func benchmarkCBCRead(b *testing.B, keyLength int, valueLength int, stale bool) if err != nil { b.Fatal(err) } - if stale { - b.Fatalf("unexpected data: %t %q", stale, from) + if expectStale != stale { + b.Fatalf("unexpected data: %q, expect stale %t but got %t", from, expectStale, stale) } } b.StopTimer() diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go index 9e9ae2f5aa2..1dd42bd4da3 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go @@ -84,7 +84,7 @@ func BenchmarkSecretboxRead_32_16384_Stale(b *testing.B) { benchmarkSecretboxRea func BenchmarkSecretboxWrite_32_1024(b *testing.B) { benchmarkSecretboxWrite(b, 32, 1024) } func BenchmarkSecretboxWrite_32_16384(b *testing.B) { benchmarkSecretboxWrite(b, 32, 16384) } -func benchmarkSecretboxRead(b *testing.B, keyLength int, valueLength int, stale bool) { +func benchmarkSecretboxRead(b *testing.B, keyLength int, valueLength int, expectStale bool) { p := value.NewPrefixTransformers(nil, value.PrefixTransformer{Prefix: []byte("first:"), Transformer: NewSecretboxTransformer(key1)}, value.PrefixTransformer{Prefix: []byte("second:"), Transformer: NewSecretboxTransformer(key2)}, @@ -97,11 +97,11 @@ func benchmarkSecretboxRead(b *testing.B, keyLength int, valueLength int, stale if err != nil { b.Fatal(err) } - // reverse the key order if stale - if stale { + // reverse the key order if expecting stale + if expectStale { p = value.NewPrefixTransformers(nil, - value.PrefixTransformer{Prefix: []byte("first:"), Transformer: NewSecretboxTransformer(key1)}, value.PrefixTransformer{Prefix: []byte("second:"), Transformer: NewSecretboxTransformer(key2)}, + value.PrefixTransformer{Prefix: []byte("first:"), Transformer: NewSecretboxTransformer(key1)}, ) } @@ -111,8 +111,8 @@ func benchmarkSecretboxRead(b *testing.B, keyLength int, valueLength int, stale if err != nil { b.Fatal(err) } - if stale { - b.Fatalf("unexpected data: %t %q", stale, from) + if expectStale != stale { + b.Fatalf("unexpected data: %q, expect stale %t but got %t", from, expectStale, stale) } } b.StopTimer()