Only do the verification when v2store has caught with v3store

ahrtr · ahrtr · commit 87f5cb2ce416 · 2025-03-10T15:47:19.000Z
Signed-off-by: Benjamin Wang &lt;benjamin.ahrtr@gmail.com&gt;
diff --git a/server/etcdserver/server.go b/server/etcdserver/server.go
@@ -2452,16 +2452,21 @@ func (s *EtcdServer) applyConfChange(cc raftpb.ConfChange, confState *raftpb.Con
 		}
 	}
 
-	s.verifyV3StoreInSyncWithV2Store()
+	s.verifyV3StoreInSyncWithV2Store(shouldApplyV3)
 
 	return false, nil
 }
 
-func (s *EtcdServer) verifyV3StoreInSyncWithV2Store() {
+func (s *EtcdServer) verifyV3StoreInSyncWithV2Store(shouldApplyV3 membership.ShouldApplyV3) {
 	if !verify.VerifyEnabled() {
 		return
 	}
 
+	// If shouldApplyV3 == false, then it means v2store hasn't caught up with v3store.
+	if !shouldApplyV3 {
+		return
+	}
+
 	v2Members, v2RemovedMembers := s.cluster.MembersFromStore()
 	v3Members, v3RemovedMembers := s.cluster.MembersFromBackend()
 

Original file line number	Diff line number	Diff line change
`@@ -2452,16 +2452,21 @@ func (s EtcdServer) applyConfChange(cc raftpb.ConfChange, confState raftpb.Con`
`2452`	`2452`	`}`
`2453`	`2453`	`}`
`2454`	`2454`
`2455`		`- s.verifyV3StoreInSyncWithV2Store()`
	`2455`	`+ s.verifyV3StoreInSyncWithV2Store(shouldApplyV3)`
`2456`	`2456`
`2457`	`2457`	`return false, nil`
`2458`	`2458`	`}`
`2459`	`2459`
`2460`		`-func (s *EtcdServer) verifyV3StoreInSyncWithV2Store() {`
	`2460`	`+func (s *EtcdServer) verifyV3StoreInSyncWithV2Store(shouldApplyV3 membership.ShouldApplyV3) {`
`2461`	`2461`	`if !verify.VerifyEnabled() {`
`2462`	`2462`	`return`
`2463`	`2463`	`}`
`2464`	`2464`
	`2465`	`+ // If shouldApplyV3 == false, then it means v2store hasn't caught up with v3store.`
	`2466`	`+ if !shouldApplyV3 {`
	`2467`	`+ return`
	`2468`	`+ }`
	`2469`	`+`
`2465`	`2470`	`v2Members, v2RemovedMembers := s.cluster.MembersFromStore()`
`2466`	`2471`	`v3Members, v3RemovedMembers := s.cluster.MembersFromBackend()`
`2467`	`2472`