Browse Source

Merge pull request #8666 from lorneli/ordering

clientv3/ordering: compare and update prevRev atomically
Xiang Li 8 years ago
parent
commit
ed92420950
1 changed files with 6 additions and 5 deletions
  1. 6 5
      clientv3/ordering/kv.go

+ 6 - 5
clientv3/ordering/kv.go

@@ -42,11 +42,10 @@ func (kv *kvOrdering) getPrevRev() int64 {
 }
 
 func (kv *kvOrdering) setPrevRev(currRev int64) {
-	prevRev := kv.getPrevRev()
-	if currRev > prevRev {
-		kv.revMu.Lock()
+	kv.revMu.Lock()
+	defer kv.revMu.Unlock()
+	if currRev > kv.prevRev {
 		kv.prevRev = currRev
-		kv.revMu.Unlock()
 	}
 }
 
@@ -63,7 +62,9 @@ func (kv *kvOrdering) Get(ctx context.Context, key string, opts ...clientv3.OpOp
 			return nil, err
 		}
 		resp := r.Get()
-		if resp.Header.Revision >= prevRev {
+		if resp.Header.Revision == prevRev {
+			return resp, nil
+		} else if resp.Header.Revision > prevRev {
 			kv.setPrevRev(resp.Header.Revision)
 			return resp, nil
 		}