Merge pull request #154176 from cockroachdb/blathers/backport-release-25.4-154168

miraradeva · web-flow · commit d480f2aafed8 · 2025-09-26T09:08:46.000-04:00
release-25.4: roachtest: fix log file in slow-drain test
diff --git a/pkg/cmd/roachtest/tests/slow_drain.go b/pkg/cmd/roachtest/tests/slow_drain.go
@@ -134,7 +134,7 @@ func runSlowDrain(ctx context.Context, t test.Test, c cluster.Cluster, duration
 	testutils.SucceedsWithin(t, func() error {
 		for nodeID := 2; nodeID <= numNodes; nodeID++ {
 			if err := c.RunE(ctx, option.WithNodes(c.Node(nodeID)),
-				fmt.Sprintf("grep -q '%s' logs/cockroach.log", verboseStoreLogRe),
+				fmt.Sprintf("grep -q '%s' logs/cockroach-kv-distribution.log", verboseStoreLogRe),
 			); err == nil {
 				return nil
 			}

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func runSlowDrain(ctx context.Context, t test.Test, c cluster.Cluster, duration`
`134`	`134`	`testutils.SucceedsWithin(t, func() error {`
`135`	`135`	`for nodeID := 2; nodeID <= numNodes; nodeID++ {`
`136`	`136`	`if err := c.RunE(ctx, option.WithNodes(c.Node(nodeID)),`
`137`		`- fmt.Sprintf("grep -q '%s' logs/cockroach.log", verboseStoreLogRe),`
	`137`	`+ fmt.Sprintf("grep -q '%s' logs/cockroach-kv-distribution.log", verboseStoreLogRe),`
`138`	`138`	`); err == nil {`
`139`	`139`	`return nil`
`140`	`140`	`}`