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

test: enhance the test case TestV3WatchProgressOnMemberRestart

Browse Source 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
This commit is contained in:
Benjamin Wang 2023-02-10 20:18:53 +08:00
parent ed529ab0e5
commit 9c81b86e90
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
integration/v3_watch_test.go
View File

@ -896,6 +896,7 @@ func TestV3WatchProgressOnMemberRestart(t *testing.T) {
defer cancel() defer cancel()
errC := make(chan error, 1) errC := make(chan error, 1)
watchReady := make(chan struct{}, 1)
doneC := make(chan struct{}, 1) doneC := make(chan struct{}, 1)
progressNotifyC := make(chan struct{}, 1) progressNotifyC := make(chan struct{}, 1)
go func() { go func() {
@ -907,13 +908,14 @@ func TestV3WatchProgressOnMemberRestart(t *testing.T) {
) )
wch := client.Watch(ctx, "foo", clientv3.WithProgressNotify()) wch := client.Watch(ctx, "foo", clientv3.WithProgressNotify())
watchReady <- struct{}{}
for wr := range wch { for wr := range wch {
if wr.Err() != nil { if wr.Err() != nil {
errC <- fmt.Errorf("watch error: %w", wr.Err()) errC <- fmt.Errorf("watch error: %w", wr.Err())
return return
} }
if wr.IsProgressNotify() { if len(wr.Events) == 0 {
// We need to make sure at least one progress notification // We need to make sure at least one progress notification
// is received after receiving the normal watch response // is received after receiving the normal watch response
// and before restarting the member. // and before restarting the member.
@ -940,6 +942,11 @@ func TestV3WatchProgressOnMemberRestart(t *testing.T) {
} }
}() }()
// waiting for the watcher ready
t.Log("Waiting for the watcher to be ready.")
<-watchReady
time.Sleep(time.Second)
// write the key before the member restarts // write the key before the member restarts
t.Log("Writing key 'foo'") t.Log("Writing key 'foo'")
_, err := client.Put(ctx, "foo", "bar1") _, err := client.Put(ctx, "foo", "bar1")
@ -948,13 +955,17 @@ func TestV3WatchProgressOnMemberRestart(t *testing.T) {
// make sure at least one progress notification is received // make sure at least one progress notification is received
// before restarting the member // before restarting the member
t.Log("Waiting for the progress notification") t.Log("Waiting for the progress notification")
<-progressNotifyC select {
case <-progressNotifyC:
case <-time.After(5 * time.Second):
t.Log("Do not receive the progress notification in 5 seconds, move forward anyway.")
}
// restart the member // restart the member
t.Log("Restarting the member") t.Log("Restarting the member")
clus.Members[0].Stop(t) clus.Members[0].Stop(t)
clus.Members[0].Restart(t) clus.Members[0].Restart(t)
clus.WaitLeader(t) clus.Members[0].WaitOK(t)
// write the same key again after the member restarted // write the same key again after the member restarted
t.Log("Writing the same key 'foo' again after restarting the member") t.Log("Writing the same key 'foo' again after restarting the member")
@ -967,7 +978,7 @@ func TestV3WatchProgressOnMemberRestart(t *testing.T) {
t.Fatal(err) t.Fatal(err)
case <-doneC: case <-doneC:
t.Log("Done") t.Log("Done")
case <-time.After(20 * time.Second): case <-time.After(15 * time.Second):
t.Fatal("Timed out waiting for the response") t.Fatal("Timed out waiting for the response")
} }
} }