Adjustments to the specialized scenario

mitdbg · Nov 29, 2023 · 7ccdc00 · 7ccdc00
1 parent ffac67e
commit 7ccdc00
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 4 deletions.
diff --git a/experiments/15-e2e-scenarios-v2/specialized/COND b/experiments/15-e2e-scenarios-v2/specialized/COND
@@ -18,7 +18,7 @@ run_experiment(
 # Essentially the same as above.
 run_command(
   name="brad_100g_vector_debug",
-  run="./run_vector_workload.sh",
+  run="./run_vector_workload_debug.sh",
   options={
     # TODO: Ideally, configurations are shared. Only keep AWS secrets separate.
     "config-file": "config/config_specialized.yml",

diff --git a/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload.sh b/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload.sh
@@ -30,10 +30,10 @@ log_workload_point "brad_start_initiated"
 sleep 30
 
 log_workload_point "clients_starting"
-start_repeating_olap_runner 8 5 5 $query_indices "ra_8"
+start_repeating_olap_runner 4 5 5 $query_indices "ra_4"
 rana_pid=$runner_pid
 
-start_sequence_runner 8 5 5 "ra_vector" 8
+start_sequence_runner 2 8 5 "ra_vector" 4
 other_pid=$runner_pid
 
 start_txn_runner 4  # Implicit: --dataset-type

diff --git a/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload_debug.sh b/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload_debug.sh
@@ -0,0 +1,56 @@
+#! /bin/bash
+
+script_loc=$(cd $(dirname $0) && pwd -P)
+cd $script_loc
+source ../common.sh
+
+# Arguments:
+# --config-file
+# --planner-config-file
+# --query-indexes
+extract_named_arguments $@
+
+# Repeating query indexes:
+# 51, 53, 58, 61, 62, 64, 65, 66, 69, 72, 73, 74, 77, 86, 91
+#
+# Touch `title`:
+# 65, 69, 73
+#
+# Heavy repeating query indexes:
+# 14, 54, 59, 60, 71, 75
+#
+# Touch `title`:
+# 14, 54, 59, 75
+
+query_indices="62,64,65,66,69,72,73,74,91,59"
+
+export BRAD_IGNORE_BLUEPRINT=1
+start_brad_debug $config_file $planner_config_file
+log_workload_point "brad_start_initiated"
+sleep 30
+
+log_workload_point "clients_starting"
+start_repeating_olap_runner 4 5 5 $query_indices "ra_4"
+rana_pid=$runner_pid
+
+start_sequence_runner 2 8 5 "ra_vector" 4
+other_pid=$runner_pid
+
+start_txn_runner 4  # Implicit: --dataset-type
+txn_pid=$runner_pid
+log_workload_point "clients_started"
+
+function inner_cancel_experiment() {
+  cancel_experiment $rana_pid $txn_pid $other_pid
+}
+
+trap "inner_cancel_experiment" INT
+trap "inner_cancel_experiment" TERM
+
+sleep $((60 * 60))  # Wait for 1 hour.
+log_workload_point "experiment_done"
+
+# Shut down everything now.
+>&2 echo "Experiment done. Shutting down runners..."
+graceful_shutdown $rana_pid $txn_pid $other_pid
+log_workload_point "shutdown_complete"
diff --git a/experiments/15-e2e-scenarios-v2/specialized/set_up_vector_blueprint.py b/experiments/15-e2e-scenarios-v2/specialized/set_up_vector_blueprint.py
@@ -113,7 +113,7 @@ def main():
     enum_blueprint.set_routing_policy(replaced_policy)
 
     # Ensure the provisioning is as expected.
-    enum_blueprint.set_aurora_provisioning(Provisioning("db.r6g.xlarge", 1))
+    enum_blueprint.set_aurora_provisioning(Provisioning("db.r6g.xlarge", 2))
     enum_blueprint.set_redshift_provisioning(Provisioning("dc2.large", 0))
 
     # 6. Adjust the placement.