WIP: add member id to client watch reponses, add validateWatchSequential to check memberID in events

Signed-off-by: ah8ad3 <[email protected]>

Signed-off-by: ah8ad3 <[email protected]>

-

Signed-off-by: ah8ad3 <[email protected]>

Author: ah8ad3

tests/robustness/client/client.go

@@ -316,6 +316,7 @@ func ToWatchResponse(r clientv3.WatchResponse, baseTime time.Time) model.WatchRe
 	}
 	resp.IsProgressNotify = r.IsProgressNotify()
 	resp.Revision = r.Header.Revision
+	resp.MemberId = r.Header.MemberId
 	err := r.Err()
 	if err != nil {
 		resp.Error = r.Err().Error()

tests/robustness/main_test.go

@@ -96,6 +96,7 @@ func testRobustness(ctx context.Context, t *testing.T, lg *zap.Logger, s testSce
 
 	watchProgressNotifyEnabled := r.Cluster.Cfg.ServerConfig.ExperimentalWatchProgressNotifyInterval != 0
 	validateGotAtLeastOneProgressNotify(t, r.Client, s.watch.requestProgress || watchProgressNotifyEnabled)
+	validateWatchSequential(t, r.Client)
 	validateConfig := validate.Config{ExpectRevisionUnique: s.traffic.ExpectUniqueRevision()}
 	r.Visualize = validate.ValidateAndReturnVisualize(t, lg, validateConfig, r.Client, persistedRequests, 5*time.Minute)
 

tests/robustness/model/watch.go

@@ -26,5 +26,6 @@ type WatchResponse struct {
 	IsProgressNotify bool
 	Revision         int64
 	Time             time.Duration
+	MemberId         uint64
 	Error            string
 }

tests/robustness/watch.go

@@ -143,3 +143,27 @@ external:
 		t.Errorf("Progress notify does not match, expect: %v, got: %v", expectProgressNotify, gotProgressNotify)
 	}
 }
+
+func validateWatchSequential(t *testing.T, reports []report.ClientReport) {
+	for _, r := range reports {
+		for _, op := range r.Watch {
+			if op.Request.Revision != 0 {
+				continue
+			}
+			lastEventRevision := make(map[uint64]int64)
+			for _, resp := range op.Responses {
+				if len(resp.Events) == 0 {
+					continue
+				}
+				if _, ok := lastEventRevision[resp.MemberId]; !ok {
+					lastEventRevision[resp.MemberId] = 1
+				}
+				firstEventRevision := resp.Events[0].Revision
+				if firstEventRevision < lastEventRevision[resp.MemberId] {
+					t.Errorf("Error watch sequential, expect: %v or higher, got: %v, member id: %v", lastEventRevision[resp.MemberId], firstEventRevision, resp.MemberId)
+				}
+				lastEventRevision[resp.MemberId] = resp.Events[len(resp.Events)-1].Revision
+			}
+		}
+	}
+}