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

snapshot: fix "TestSnapshotV3RestoreMultiMemberAdd"

Browse Source 
Membership reconfiguration may not be applied
when the new member joins. Also pass all endpoints
to check restore data in case of leader election or
network faults.

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-02-02 09:38:56 -08:00
parent 50d91036a8
commit 71824474df
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/testutil/var.go
View File

@ -17,5 +17,6 @@ package testutil
import "time" import "time"
var ( var (
ApplyTimeout = time.Second
RequestTimeout = 3 * time.Second RequestTimeout = 3 * time.Second
) )

26
snapshot/member_test.go
View File

@ -59,6 +59,9 @@ func TestSnapshotV3RestoreMultiMemberAdd(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
// wait for membership reconfiguration apply
time.Sleep(testutil.ApplyTimeout)
cfg := embed.NewConfig() cfg := embed.NewConfig()
cfg.Name = "3" cfg.Name = "3"
cfg.InitialClusterToken = testClusterTkn cfg.InitialClusterToken = testClusterTkn
@ -102,16 +105,21 @@ func TestSnapshotV3RestoreMultiMemberAdd(t *testing.T) {
if len(mresp.Members) != 4 { if len(mresp.Members) != 4 {
t.Fatalf("expected 4 members, got %+v", mresp) t.Fatalf("expected 4 members, got %+v", mresp)
} }
for i := range kvs {
var gresp *clientv3.GetResponse // make sure restored cluster has kept all data on recovery
ctx, cancel = context.WithTimeout(context.Background(), testutil.RequestTimeout) var gresp *clientv3.GetResponse
gresp, err = cli2.Get(ctx, kvs[i].k) ctx, cancel = context.WithTimeout(context.Background(), testutil.RequestTimeout)
cancel() gresp, err = cli2.Get(ctx, "foo", clientv3.WithPrefix())
if err != nil { cancel()
t.Fatal(err) if err != nil {
t.Fatal(err)
}
for i := range gresp.Kvs {
if string(gresp.Kvs[i].Key) != kvs[i].k {
t.Fatalf("#%d: key expected %s, got %s", i, kvs[i].k, string(gresp.Kvs[i].Key))
} }
if string(gresp.Kvs[0].Value) != kvs[i].v { if string(gresp.Kvs[i].Value) != kvs[i].v {
t.Fatalf("#%d: value expected %s, got %s", i, kvs[i].v, string(gresp.Kvs[0].Value)) t.Fatalf("#%d: value expected %s, got %s", i, kvs[i].v, string(gresp.Kvs[i].Value))
} }
} }
} }