Merge pull request #137292 from cockroachdb/blathers/backport-release…

…-24.2-137275 release-24.2: roachtest: various c2c/ldr improvements
cockroachdb · Dec 13, 2024 · a34d124 · a34d124
2 parents 67e10ff + dff8f29
commit a34d124
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/pkg/cmd/roachtest/tests/cluster_to_cluster.go b/pkg/cmd/roachtest/tests/cluster_to_cluster.go
@@ -1124,7 +1124,7 @@ func registerClusterToCluster(r registry.Registry) {
 			timeout:            3 * time.Hour,
 			additionalDuration: 60 * time.Minute,
 			cutover:            30 * time.Minute,
-			clouds:             registry.AllClouds,
+			clouds:             registry.OnlyGCE,
 			suites:             registry.Suites(registry.Nightly),
 		},
 		{
@@ -1161,7 +1161,7 @@ func registerClusterToCluster(r registry.Registry) {
 			timeout:            1 * time.Hour,
 			additionalDuration: 5 * time.Minute,
 			cutover:            0,
-			clouds:             registry.AllExceptAzure,
+			clouds:             registry.OnlyGCE,
 			suites:             registry.Suites(registry.Nightly),
 		},
 		{
@@ -1292,7 +1292,7 @@ func registerClusterToCluster(r registry.Registry) {
 			cutover:                   30 * time.Second,
 			skipNodeDistributionCheck: true,
 			skip:                      "for local ad hoc testing",
-			clouds:                    registry.AllClouds,
+			clouds:                    registry.OnlyGCE,
 			suites:                    registry.Suites(registry.Nightly),
 		},
 		{
@@ -1590,8 +1590,12 @@ func registerClusterReplicationResilience(r registry.Registry) {
 			cutover:                              3 * time.Minute,
 			expectedNodeDeaths:                   1,
 			sometimesTestFingerprintMismatchCode: true,
-			clouds:                               registry.OnlyGCE,
-			suites:                               registry.Suites(registry.Nightly),
+			// The job system can take up to 2 minutes to reclaim a job if the
+			// coordinator dies, so increase the max expected latency to account for
+			// our lovely job system.
+			maxAcceptedLatency: 4 * time.Minute,
+			clouds:             registry.OnlyGCE,
+			suites:             registry.Suites(registry.Nightly),
 		}
 
 		c2cRegisterWrapper(r, rsp.replicationSpec,

diff --git a/pkg/cmd/roachtest/tests/logical_data_replication.go b/pkg/cmd/roachtest/tests/logical_data_replication.go
@@ -146,7 +146,7 @@ func registerLogicalDataReplicationTests(r registry.Registry) {
 			Name:             sp.name,
 			Owner:            registry.OwnerDisasterRecovery,
 			Timeout:          60 * time.Minute,
-			CompatibleClouds: registry.AllClouds,
+			CompatibleClouds: registry.OnlyGCE,
 			Suites:           registry.Suites(registry.Nightly),
 			Cluster:          sp.clusterSpec.ToSpec(r),
 			Leases:           registry.MetamorphicLeases,

diff --git a/pkg/cmd/roachtest/tests/mixed_version_c2c.go b/pkg/cmd/roachtest/tests/mixed_version_c2c.go
@@ -39,7 +39,7 @@ func registerC2CMixedVersions(r registry.Registry) {
 		additionalDuration:        0 * time.Minute,
 		cutover:                   30 * time.Second,
 		skipNodeDistributionCheck: true,
-		clouds:                    registry.AllClouds,
+		clouds:                    registry.OnlyGCE,
 		suites:                    registry.Suites(registry.Nightly),
 	}