Set environment variable COCKROACH_ROACHPROD_INSECURE to false.

Epic: none

Release note: None

Author: shailendra-patel

pkg/cmd/drtprod/configs/drt_pua_9.yaml

@@ -13,6 +13,7 @@ environment:
   WORKLOAD_CLUSTER: workload-pua-9
   WORKLOAD_NODES: 1
   STORE_COUNT: 2
+  COCKROACH_ROACHPROD_INSECURE: false
 
   TPCC_WAREHOUSES: 5000
   TPCC_ACTIVE_WAREHOUSES: 5000

pkg/cmd/drtprod/configs/drt_pua_mr.yaml

@@ -12,6 +12,7 @@ environment:
   CLUSTER_NODES: 15
   WORKLOAD_NODES: 3
   STORE_COUNT: 2
+  COCKROACH_ROACHPROD_INSECURE: false
 
   # variables used by tpcc_run_multiregion.sh
   NUM_REGIONS: 3
@@ -34,6 +35,7 @@ environment:
 
 dependent_file_locations:
   - artifacts/roachprod
+  - artifacts/drtprod
   - artifacts/roachtest
   - pkg/cmd/drtprod/scripts/setup_dmsetup_disk_staller
   - pkg/cmd/drtprod/scripts/setup_datadog_cluster
@@ -60,7 +62,7 @@ targets:
           gce-local-ssd-count: $STORE_COUNT
           os-volume-size: 100
           username: drt
-          lifetime: 8760h
+          lifetime: 15h
         on_rollback:
           - command: destroy
             args:
@@ -150,7 +152,7 @@ targets:
           gce-machine-type: n2d-standard-4
           os-volume-size: 100
           username: workload
-          lifetime: 8760h
+          lifetime: 15h
         on_rollback:
           - command: destroy
             args:
@@ -171,6 +173,11 @@ targets:
           - $WORKLOAD_CLUSTER
           - artifacts/roachprod
           - roachprod
+      - command: put
+        args:
+          - $WORKLOAD_CLUSTER
+          - artifacts/drtprod
+          - drtprod
       - command: put
         args:
           - $WORKLOAD_CLUSTER:1
@@ -368,3 +375,4 @@ targets:
           - $CLUSTER:11-15
         flags:
           restart: true
+        wait_after: 3300

pkg/cmd/drtprod/scripts/generate_tpcc_run.sh

@@ -65,6 +65,11 @@ if [ -z "${PARTITION_TYPE}" ]; then
 fi
 
 export ROACHPROD_DISABLED_PROVIDERS=IBM
+# Clusters created via drtprod default to secure mode. This script is intended to
+# run on secure clusters. In the past we have run into compatibility issues
+# between roachprod and drtprod. To make this script resilient to incompatibility
+# and allow use with insecure clusters, we can configure this env variable.
+export COCKROACH_ROACHPROD_INSECURE="${COCKROACH_ROACHPROD_INSECURE:-false}"
 
 get_partitions_in_range() {
     local start=$(($1 - 1))
@@ -122,6 +127,7 @@ for ((NODE=0; NODE<WORKLOAD_NODES; NODE++)); do
 
 export ROACHPROD_DISABLED_PROVIDERS=IBM
 export ROACHPROD_GCE_DEFAULT_PROJECT=$ROACHPROD_GCE_DEFAULT_PROJECT
+export COCKROACH_ROACHPROD_INSECURE="${COCKROACH_ROACHPROD_INSECURE:-false}"
 ./drtprod sync
 
 PGURLS=\$(./drtprod load-balancer pgurl $CLUSTER | sed s/\'//g)

pkg/cmd/drtprod/scripts/tpcc_init.sh

@@ -37,6 +37,7 @@ if [ -z "${WORKLOAD_CLUSTER}" ]; then
 fi
 
 export ROACHPROD_DISABLED_PROVIDERS=IBM
+export COCKROACH_ROACHPROD_INSECURE="${COCKROACH_ROACHPROD_INSECURE:-false}"
 
 absolute_path=$(drtprod run "${WORKLOAD_CLUSTER}":1 -- "realpath ./cockroach")
 pwd=$(drtprod run "${WORKLOAD_CLUSTER}":1 -- "dirname ${absolute_path}")

pkg/cmd/drtprod/scripts/tpcc_run_multiregion.sh

@@ -29,6 +29,7 @@ for var in "${env_vars[@]}"; do
 done
 
 export ROACHPROD_DISABLED_PROVIDERS=IBM
+export COCKROACH_ROACHPROD_INSECURE="${COCKROACH_ROACHPROD_INSECURE:-false}"
 
 for NODE in $(seq 1 $NUM_REGIONS)
 do
@@ -49,11 +50,12 @@ do
 
 export ROACHPROD_DISABLED_PROVIDERS=IBM
 export ROACHPROD_GCE_DEFAULT_PROJECT=$ROACHPROD_GCE_DEFAULT_PROJECT
-./roachprod sync
-PGURLS=\$(./roachprod load-balancer pgurl $CLUSTER | sed s/\'//g)
+export COCKROACH_ROACHPROD_INSECURE="${COCKROACH_ROACHPROD_INSECURE:-false}"
+./drtprod sync
+PGURLS=\$(./drtprod load-balancer pgurl $CLUSTER | sed s/\'//g)
 if [ -z "\$PGURLS" ]; then
     echo ">> No load-balancer configured; falling back to direct pgurl"
-    PGURLS=\$(./roachprod pgurl $CLUSTER | sed s/\'//g)
+    PGURLS=\$(./drtprod pgurl $CLUSTER | sed s/\'//g)
 fi
 read -r -a PGURLS_REGION <<< "\$PGURLS"