Merge #144368 #144401 #144402

144368: roachtest: provision admission-control/database-drop with 800GiB/node r=tbg a=tbg

This gives the cluster >7TiB of available capacity, which should be more than enough to import the ~4.1TiB dataset.

Informs #143690 (comment).
^-- does not fix, since we also saw unique constraint violations.

Epic: none
Release note: None

144401: logictestccl: wait for tenant overrides to propagate in multi_region_secondary_tenants_abstractions_allowed r=rafiss a=rafiss

fixes #144275
fixes #144283
Release note: None

144402: microbench-ci: fix err check panic r=DarrylWong a=herkolategan

The `skipPermissionError` function should be able to handle nil errors, otherwise we panic when trying to string match on a specific error.

Epic: None
Release note: None

Co-authored-by: Tobias Grieger <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>
Co-authored-by: Herko Lategan <[email protected]>

Author: 4 people

pkg/ccl/logictestccl/testdata/logic_test/multi_region_secondary_tenants_abstractions_allowed

@@ -29,6 +29,12 @@ ALTER TENANT ALL SET CLUSTER SETTING sql.zone_configs.max_replicas_per_region =
 
 user root
 
+# Wait for the setting to be propagated to the tenant cluster.
+query I retry
+SHOW CLUSTER SETTING sql.zone_configs.max_replicas_per_region
+----
+4
+
 # Our setting should not affect non-constraint related zone config updates.
 statement ok
 ALTER DATABASE db CONFIGURE ZONE USING gc.ttlseconds = 1
@@ -49,6 +55,12 @@ ALTER TENANT ALL SET CLUSTER SETTING sql.zone_configs.max_replicas_per_region =
 
 user root
 
+# Wait for the setting to be propagated to the tenant cluster.
+query I retry
+SHOW CLUSTER SETTING sql.zone_configs.max_replicas_per_region
+----
+3
+
 statement ok
 ALTER DATABASE db CONFIGURE ZONE USING gc.ttlseconds = 1
 
@@ -73,6 +85,12 @@ ALTER TENANT ALL SET CLUSTER SETTING sql.zone_configs.default_range_modifiable_b
 
 user root
 
+# Wait for the setting to be propagated to the tenant cluster.
+query B retry
+SHOW CLUSTER SETTING sql.zone_configs.default_range_modifiable_by_non_root.enabled
+----
+false
+
 statement ok
 ALTER RANGE default CONFIGURE ZONE USING num_replicas = 10
 

pkg/cmd/microbench-ci/main.go

@@ -164,6 +164,9 @@ func makeCompareCommand() *cobra.Command {
 			}
 			if hasLabel || suite.changeDetected() {
 				skipPermissionError := func(err error, action string) error {
+					if err == nil {
+						return nil
+					}
 					// If this is a permission error, we don't want to fail the build. This
 					// can happen if the GitHub token has read-only access, for example when
 					// testing the pull_request trigger from a fork.

pkg/cmd/roachtest/tests/admission_control_database_drop.go

@@ -29,7 +29,12 @@ func registerDatabaseDrop(r registry.Registry) {
 		spec.CPU(8),
 		spec.WorkloadNode(),
 		spec.WorkloadNodeCPU(8),
-		spec.VolumeSize(500),
+		// The dataset uses above 4TiB of data, and if we have to create the dataset
+		// via IMPORT we need some buffer. 500GiB per node (4.5TiB total) has been
+		// found to fail regularly in the past since the IMPORT job fails when any
+		// node falls below 5% available capacity. 800GiB (7.2TiB) ought to be more
+		// than enough.
+		spec.VolumeSize(800),
 		spec.GCEVolumeType("pd-ssd"),
 		spec.GCEMachineType("n2-standard-8"),
 		spec.GCEZones("us-east1-b"),