tests: Add revision to etcd linearizability model

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
etcd-io · Nov 3, 2022 · c0947e9 · c0947e9
1 parent a0da7c1
commit c0947e9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/tests/linearizability/client.go b/tests/linearizability/client.go
@@ -66,21 +66,25 @@ func (c *recordingClient) Get(ctx context.Context, key string) error {
 		ClientId: c.id,
 		Input:    etcdRequest{op: Get, key: key},
 		Call:     callTime.UnixNano(),
-		Output:   etcdResponse{getData: readData},
+		Output:   etcdResponse{getData: readData, revision: resp.Header.Revision},
 		Return:   returnTime.UnixNano(),
 	})
 	return nil
 }
 
 func (c *recordingClient) Put(ctx context.Context, key, value string) error {
 	callTime := time.Now()
-	_, err := c.client.Put(ctx, key, value)
+	resp, err := c.client.Put(ctx, key, value)
 	returnTime := time.Now()
+	var revision int64
+	if resp != nil && resp.Header != nil {
+		revision = resp.Header.Revision
+	}
 	c.operations = append(c.operations, porcupine.Operation{
 		ClientId: c.id,
 		Input:    etcdRequest{op: Put, key: key, putData: value},
 		Call:     callTime.UnixNano(),
-		Output:   etcdResponse{err: err},
+		Output:   etcdResponse{err: err, revision: revision},
 		Return:   returnTime.UnixNano(),
 	})
 	return nil

diff --git a/tests/linearizability/model.go b/tests/linearizability/model.go
@@ -33,13 +33,15 @@ type etcdRequest struct {
 }
 
 type etcdResponse struct {
-	getData string
-	err     error
+	getData  string
+	revision int64
+	err      error
 }
 
 type EtcdState struct {
 	Key          string
 	Value        string
+	LastRevision int64
 	FailedWrites map[string]struct{}
 }
 
@@ -64,22 +66,19 @@ var etcdModel = porcupine.Model{
 	DescribeOperation: func(in, out interface{}) string {
 		request := in.(etcdRequest)
 		response := out.(etcdResponse)
-		var resp string
 		switch request.op {
 		case Get:
 			if response.err != nil {
-				resp = response.err.Error()
+				return fmt.Sprintf("get(%q) -> %q", request.key, response.err)
 			} else {
-				resp = response.getData
+				return fmt.Sprintf("get(%q) -> %q, rev: %d", request.key, response.getData, response.revision)
 			}
-			return fmt.Sprintf("get(%q) -> %q", request.key, resp)
 		case Put:
 			if response.err != nil {
-				resp = response.err.Error()
+				return fmt.Sprintf("put(%q, %q) -> %s", request.key, request.putData, response.err)
 			} else {
-				resp = "ok"
+				return fmt.Sprintf("put(%q, %q) -> ok, rev: %d", request.key, request.putData, response.revision)
 			}
-			return fmt.Sprintf("put(%q, %q) -> %s", request.key, request.putData, resp)
 		default:
 			return "<invalid>"
 		}
@@ -96,6 +95,9 @@ func step(state EtcdState, request etcdRequest, response etcdResponse) (bool, Et
 	if state.Key != request.key {
 		panic("Multiple keys not supported")
 	}
+	if response.revision != 0 && response.revision < state.LastRevision {
+		return false, state
+	}
 	switch request.op {
 	case Get:
 		if state.Value == response.getData {
@@ -104,12 +106,14 @@ func step(state EtcdState, request etcdRequest, response etcdResponse) (bool, Et
 		_, ok := state.FailedWrites[response.getData]
 		if ok {
 			state.Value = response.getData
+			state.LastRevision = response.revision
 			delete(state.FailedWrites, response.getData)
 			return true, state
 		}
 	case Put:
 		if response.err == nil {
 			state.Value = request.putData
+			state.LastRevision = response.revision
 		} else {
 			state.FailedWrites[request.putData] = struct{}{}
 		}