Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14552 from fuweid/deflaking-14477

Browse Source 
integration: deflaking TestMaintenanceSnapshotCancel/Timeout
This commit is contained in:
Marek Siarkowicz 2022-10-06 09:52:14 +02:00 committed by GitHub
commit 6a0bbf3462
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/integration/clientv3/maintenance_test.go
View File

@ -31,7 +31,7 @@ import (
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/storage/mvcc"
@ -156,6 +156,16 @@ func TestMaintenanceSnapshotCancel(t *testing.T) {
// reading snapshot with canceled context should error out
ctx, cancel := context.WithCancel(context.Background())
// Since http2 spec defines the receive windows's size and max size of
// frame in the stream, the underlayer - gRPC client can pre-read data
// from server even if the application layer hasn't read it yet.
//
// And the initialized cluster has 20KiB snapshot, which can be
// pre-read by underlayer. We should increase the snapshot's size here,
// just in case that io.Copy won't return the canceled error.
populateDataIntoCluster(t, clus, 3, 1024*1024)
rc1, err := clus.RandClient().Snapshot(ctx)
if err != nil {
t.Fatal(err)
@ -200,6 +210,16 @@ func testMaintenanceSnapshotTimeout(t *testing.T, snapshot func(context.Context,
// reading snapshot with deadline exceeded should error out
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
// Since http2 spec defines the receive windows's size and max size of
// frame in the stream, the underlayer - gRPC client can pre-read data
// from server even if the application layer hasn't read it yet.
//
// And the initialized cluster has 20KiB snapshot, which can be
// pre-read by underlayer. We should increase the snapshot's size here,
// just in case that io.Copy won't return the timeout error.
populateDataIntoCluster(t, clus, 3, 1024*1024)
rc2, err := snapshot(ctx, clus.RandClient())
if err != nil {
t.Fatal(err)

19
tests/integration/clientv3/util.go
View File

@ -16,11 +16,13 @@ package clientv3test
import (
"context"
"fmt"
"strings"
"testing"
"time"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
@ -101,3 +103,18 @@ func IsUnavailable(err error) bool {
code := ev.Code()
return code == codes.Unavailable
}
// populateDataIntoCluster populates the key-value pairs into cluster and the
// key will be named by testing.T.Name()-index.
func populateDataIntoCluster(t *testing.T, cluster *integration2.Cluster, numKeys int, valueSize int) {
ctx := context.Background()
for i := 0; i < numKeys; i++ {
_, err := cluster.RandClient().Put(ctx,
fmt.Sprintf("%s-%v", t.Name(), i), strings.Repeat("a", valueSize))
if err != nil {
t.Errorf("populating data expected no error, but got %v", err)
}
}
}