Merge pull request #14290 from ahrtr/3.4_no_prevkv_for_create

[3.4] Do not get previous K/V for create event
etcd-io · Aug 1, 2022 · ee36615 · ee36615
2 parents 314dcbf + 095bbfc
commit ee36615
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go
@@ -400,7 +400,7 @@ func (sws *serverWatchStream) sendLoop() {
 			sws.mu.RUnlock()
 			for i := range evs {
 				events[i] = &evs[i]
-				if needPrevKV {
+				if needPrevKV && !isCreateEvent(evs[i]) {
 					opt := mvcc.RangeOptions{Rev: evs[i].Kv.ModRevision - 1}
 					r, err := sws.watchable.Range(evs[i].Kv.Key, nil, opt)
 					if err == nil && len(r.KVs) != 0 {
@@ -534,6 +534,10 @@ func (sws *serverWatchStream) sendLoop() {
 	}
 }
 
+func isCreateEvent(e mvccpb.Event) bool {
+	return e.Type == mvccpb.PUT && e.Kv.CreateRevision == e.Kv.ModRevision
+}
+
 func sendFragments(
 	wr *pb.WatchResponse,
 	maxRequestBytes int,

diff --git a/test b/test
@@ -466,7 +466,7 @@ function govet_shadow_pass {
 	# shellcheck disable=SC2206
 	fmtpkgs=($fmtpkgs)
 	# Golang 1.12 onwards the experimental -shadow option is no longer available with go vet
-	go get golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow
+	go get golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@v0.1.11
 	export PATH=${GOPATH}/bin:${PATH}
 	# shellcheck disable=SC2230
 	shadow_tool=$(which shadow)