diff --git a/misc/python/materialize/feature_benchmark/benchmark.py b/misc/python/materialize/feature_benchmark/benchmark.py index 39f5c78358de3..cbf6fe76efa68 100644 --- a/misc/python/materialize/feature_benchmark/benchmark.py +++ b/misc/python/materialize/feature_benchmark/benchmark.py @@ -81,7 +81,6 @@ def run(self) -> list[Aggregation]: ) start_time = time.time() - # Run the shared() section once for both Mzs under measurement self.run_shared(scenario) # Run the init() section once for each Mz @@ -110,7 +109,7 @@ def run(self) -> list[Aggregation]: def run_shared(self, scenario: Scenario) -> None: shared = scenario.shared() - if self._mz_id == 0 and shared is not None: + if shared is not None: print( f"Running the shared() section for scenario {scenario.name()} with {self._mz_version} ..." ) diff --git a/test/feature-benchmark/mzcompose.py b/test/feature-benchmark/mzcompose.py index fa1515cdfa256..d9cbfa1267814 100644 --- a/test/feature-benchmark/mzcompose.py +++ b/test/feature-benchmark/mzcompose.py @@ -151,7 +151,10 @@ def make_aggregation_class() -> type[Aggregation]: def run_one_scenario( - c: Composition, scenario_class: type[Scenario], args: argparse.Namespace + c: Composition, + scenario_class: type[Scenario], + args: argparse.Namespace, + dependencies: list[str], ) -> BenchmarkScenarioResult: scenario_name = scenario_class.__name__ print(f"--- Now benchmarking {scenario_name} ...") @@ -295,9 +298,10 @@ def run_one_scenario( aggregation.name(), ) - c.kill("cockroach", "materialized", "clusterd", "testdrive") - c.rm("cockroach", "materialized", "clusterd", "testdrive") + c.kill("cockroach", "materialized", "clusterd", "testdrive", *dependencies) + c.rm("cockroach", "materialized", "clusterd", "testdrive", *dependencies) c.rm_volumes("mzdata") + c.up(*dependencies) if early_abort: result.empty() @@ -554,7 +558,9 @@ def workflow_default(c: Composition, parser: WorkflowArgumentParser) -> None: for scenario_class in scenario_classes_scheduled_to_run: try: - scenario_result = run_one_scenario(c, scenario_class, args) + scenario_result = run_one_scenario( + c, scenario_class, args, dependencies + ) except RuntimeError as e: if ( "No image found for commit hash" in str(e)