diff --git a/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload.sh b/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload.sh index 9e240e53..e3ddf5d7 100755 --- a/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload.sh +++ b/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload.sh @@ -48,12 +48,12 @@ function inner_cancel_experiment() { trap "inner_cancel_experiment" INT trap "inner_cancel_experiment" TERM -sleep $((5 * 60)) # Wait for 5 mins. +sleep $((16 * 60)) # Wait for 16 mins. start_repeating_olap_runner 4 5 5 $heavier_queries "ra_4_heavy" 10 heavy_pid=$runner_pid log_workload_point "heavier_queries_started" -sleep $((55 * 60)) # Wait for 55 mins. +sleep $((60 * 60)) # Wait for 60 mins. log_workload_point "experiment_done" # Shut down everything now. 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 index d46ff411..89d54daf 100644 --- a/experiments/15-e2e-scenarios-v2/specialized/set_up_vector_blueprint.py +++ b/experiments/15-e2e-scenarios-v2/specialized/set_up_vector_blueprint.py @@ -123,7 +123,7 @@ def main(): if table.name == "telemetry": new_placement[table.name] = [Engine.Athena] if table.name == "embeddings": - new_placement[table.name] = [Engine.Aurora] + new_placement[table.name] = [Engine.Aurora, Engine.Athena] enum_blueprint.set_table_locations(new_placement) # 6. Transition to the new blueprint. diff --git a/src/brad/daemon/blueprint_watchdog.py b/src/brad/daemon/blueprint_watchdog.py index 46920164..1bb8b21a 100644 --- a/src/brad/daemon/blueprint_watchdog.py +++ b/src/brad/daemon/blueprint_watchdog.py @@ -16,20 +16,6 @@ def __init__(self, event_logger: Optional[SystemEventLogger]) -> None: self._event_logger = event_logger def reject_blueprint(self, blueprint: Blueprint) -> bool: - # Telemetry table should not go onto Aurora. - try: - telemetry_locations = blueprint.get_table_locations("telemetry") - if Engine.Aurora in telemetry_locations: - if self._event_logger is not None: - self._event_logger.log( - SystemEvent.WatchdogFired, - f"telemetry_placed_on_aurora: {str(telemetry_locations)}", - ) - return True - except ValueError: - # Indicates the table is not used in this schema - no problem. - pass - # Embedding table should not leave Aurora. try: embedding_locations = blueprint.get_table_locations("embeddings")