Merge pull request #8666 from lorneli/ordering
clientv3/ordering: compare and update prevRev atomicallyrelease-3.3
commit
ed92420950
|
@ -42,11 +42,10 @@ func (kv *kvOrdering) getPrevRev() int64 {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (kv *kvOrdering) setPrevRev(currRev int64) {
|
func (kv *kvOrdering) setPrevRev(currRev int64) {
|
||||||
prevRev := kv.getPrevRev()
|
kv.revMu.Lock()
|
||||||
if currRev > prevRev {
|
defer kv.revMu.Unlock()
|
||||||
kv.revMu.Lock()
|
if currRev > kv.prevRev {
|
||||||
kv.prevRev = currRev
|
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
|
return nil, err
|
||||||
}
|
}
|
||||||
resp := r.Get()
|
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)
|
kv.setPrevRev(resp.Header.Revision)
|
||||||
return resp, nil
|
return resp, nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue