Merge #149241 #149243

craig[bot] · Pradyum-Git · iskettaneh · craig[bot] · commit 9015a1c8d41f · 2025-06-30T17:01:04.000Z
149241: authors: add Pradyum Agarwal to authors r=nameisbhaskar a=Pradyum-Git Epic: None Release note: None 149243: roachtest: increase zone config timeout in change-replicas/mixed-version r=iskettaneh a=iskettaneh There were recently a couple of failures in the test change-replicas/mixed-version. I couldn't find anything that indicates an actual bug. I think that it might have been just a general slowness in the environment. Therefore, this commit increases the zone config timeout from 3m to 4m. References: #148991 Release note: None Co-authored-by: Pradyum <pradyum.agarwal@cockroachlabs.com> Co-authored-by: iskettaneh <173953022+iskettaneh@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
@@ -421,6 +421,7 @@ PJ Tatlow <pj@cockroachlabs.com> pjtatlow <pjtatlow@gmail.com>
 pocockn <pocockn@hotmail.co.uk>
 Pooja Maniar <maniar.pooja36@gmail.com> <poojam@cockroachlabs.com>
 Poornima Malepati <poornima.malepati@gmail.com> Poornima <poornima.malepati@gmail.com>
+Pradyum Agarwal <pradyum.agarwal@cockroachlabs.com>
 Pransu Dash <pransu@cockroachlabs.com>
 Pritesh Lahoti <pritesh.lahoti@cockroachlabs.com>
 Rachael Harding <harding@cockroachlabs.com>
diff --git a/pkg/cmd/roachtest/tests/mixed_version_change_replicas.go b/pkg/cmd/roachtest/tests/mixed_version_change_replicas.go
@@ -111,7 +111,7 @@ func runChangeReplicasMixedVersion(ctx context.Context, t test.Test, c cluster.C
 		}
 
 		var rangeCount int
-		for i := 0; i < 60; i++ {
+		for i := 0; i < 80; i++ {
 			err := h.QueryRow(r, `SELECT count(*) FROM `+
 				`[SHOW RANGES FROM TABLE test] WHERE $1::int = ANY(replicas)`, node).Scan(&rangeCount)
 			if err != nil {

-Original file line number
+Diff line change
 pocockn <[email protected]>
 Pooja Maniar <[email protected]> <[email protected]>
 Poornima Malepati <[email protected]> Poornima <[email protected]>
 +Pradyum Agarwal <[email protected]>
 Pransu Dash <[email protected]>
 Pritesh Lahoti <[email protected]>
 Rachael Harding <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func runChangeReplicasMixedVersion(ctx context.Context, t test.Test, c cluster.C`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`var rangeCount int`
`114`		`- for i := 0; i < 60; i++ {`
	`114`	`+ for i := 0; i < 80; i++ {`
`115`	`115`	err := h.QueryRow(r, `SELECT count(*) FROM `+
`116`	`116`	`[SHOW RANGES FROM TABLE test] WHERE $1::int = ANY(replicas)`, node).Scan(&rangeCount)
`117`	`117`	`if err != nil {`