Merge pull request #157028 from cockroachdb/blathers/backport-release-25.4-156985

andyyang890 · web-flow · commit 86e46732b0e5 · 2025-11-07T09:59:34.000-05:00
release-25.4: roachtest: deflake cdc/ledger
diff --git a/pkg/cmd/roachtest/tests/cdc.go b/pkg/cmd/roachtest/tests/cdc.go
@@ -2545,7 +2545,7 @@ CONFIGURE ZONE USING
 			})
 			ct.runFeedLatencyVerifier(feed, latencyTargets{
 				initialScanLatency: 10 * time.Minute,
-				steadyLatency:      time.Minute,
+				steadyLatency:      3 * time.Minute,
 			})
 			ct.waitForWorkload()
 		},
diff --git a/pkg/cmd/roachtest/tests/latency_verifier.go b/pkg/cmd/roachtest/tests/latency_verifier.go
@@ -114,7 +114,7 @@ func (lv *latencyVerifier) noteHighwater(highwaterTime time.Time) {
 		return
 	}
 
-	if lv.targetSteadyLatency == 0 || latency < lv.targetSteadyLatency/2 {
+	if lv.targetSteadyLatency == 0 || latency < lv.targetSteadyLatency {
 		lv.latencyBecameSteady = true
 	}
 	if !lv.latencyBecameSteady {

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (lv *latencyVerifier) noteHighwater(highwaterTime time.Time) {`
`114`	`114`	`return`
`115`	`115`	`}`
`116`	`116`
`117`		`- if lv.targetSteadyLatency == 0 \|\| latency < lv.targetSteadyLatency/2 {`
	`117`	`+ if lv.targetSteadyLatency == 0 \|\| latency < lv.targetSteadyLatency {`
`118`	`118`	`lv.latencyBecameSteady = true`
`119`	`119`	`}`
`120`	`120`	`if !lv.latencyBecameSteady {`