Merge pull request #152889 from cockroachdb/blathers/backport-release-25.2-152884

tbg · web-flow · commit 7f32131dcf3e · 2025-09-24T12:42:35.000+02:00
diff --git a/pkg/kv/kvserver/replica_raft.go b/pkg/kv/kvserver/replica_raft.go
@@ -702,7 +702,7 @@ func (r *Replica) stepRaftGroupRaftMuLocked(req *kvserverpb.RaftMessageRequest)
 			// Update the lastUpdateTimes map, unless configured not to by a testing
 			// knob.
 			disableUpdateLastUpdateTimesMapOnRaftGroupStep := false
-			if r.store.TestingKnobs() == nil &&
+			if r.store.TestingKnobs() != nil &&
 				r.store.TestingKnobs().DisableUpdateLastUpdateTimesMapOnRaftGroupStep != nil {
 				disableUpdateLastUpdateTimesMapOnRaftGroupStep = r.store.TestingKnobs().DisableUpdateLastUpdateTimesMapOnRaftGroupStep(r)
 			}

Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,7 @@ func (r Replica) stepRaftGroupRaftMuLocked(req kvserverpb.RaftMessageRequest)`
`702`	`702`	`// Update the lastUpdateTimes map, unless configured not to by a testing`
`703`	`703`	`// knob.`
`704`	`704`	`disableUpdateLastUpdateTimesMapOnRaftGroupStep := false`
`705`		`- if r.store.TestingKnobs() == nil &&`
	`705`	`+ if r.store.TestingKnobs() != nil &&`
`706`	`706`	`r.store.TestingKnobs().DisableUpdateLastUpdateTimesMapOnRaftGroupStep != nil {`
`707`	`707`	`disableUpdateLastUpdateTimesMapOnRaftGroupStep = r.store.TestingKnobs().DisableUpdateLastUpdateTimesMapOnRaftGroupStep(r)`
`708`	`708`	`}`