diff --git a/execution/run_uc.py b/execution/run_uc.py index 349e42120ee58a409b0114fccad79caf18fff238..52112d859e7b308217ebd2731a8d8637b493ff94 100644 --- a/execution/run_uc.py +++ b/execution/run_uc.py @@ -456,7 +456,7 @@ def reset_cluster(wg, app_svc, app_svc_monitor, app_jmx, app_deploy, topics): stop_lag_exporter() -def main(exp_id, uc_id, dim_value, instances, partitions, cpu_limit, memory_limit, commit_interval_ms, execution_minutes, prometheus_base_url=None, reset=False, reset_only=False, ns=namespace): +def main(exp_id, uc_id, dim_value, instances, partitions, cpu_limit, memory_limit, commit_interval_ms, execution_minutes, prometheus_base_url, reset, reset_only, ns): """ Main method to execute one time the benchmark for a given use case. Start workload generator/application -> execute -> analyse -> stop all diff --git a/execution/strategies/subexperiment_execution/subexperiment_executor.py b/execution/strategies/subexperiment_execution/subexperiment_executor.py index d971031a2c0ec40e6ae6711432015fe71add6404..7bcf182f5bee1fcc99d2a8c0040df208ae77bdb3 100644 --- a/execution/strategies/subexperiment_execution/subexperiment_executor.py +++ b/execution/strategies/subexperiment_execution/subexperiment_executor.py @@ -14,5 +14,7 @@ def execute(subexperiment_config): memory_limit=subexperiment_config.memory_limit, commit_interval_ms=subexperiment_config.kafka_streams_commit_interval_ms, execution_minutes=int(subexperiment_config.execution_minutes), + prometheus_base_url=None, reset=False, - reset_only=False) + reset_only=False, + ns="default") diff --git a/execution/theodolite.py b/execution/theodolite.py index 9ca98ddc4bfb34df9b4df1d4e67da37537704a79..3c0506355aff373795adb762e0b66ec64456c5df 100755 --- a/execution/theodolite.py +++ b/execution/theodolite.py @@ -29,7 +29,9 @@ def load_variables(): return args -def main(uc, loads, instances_list, partitions, cpu_limit, memory_limit, commit_ms, duration, domain_restriction, search_strategy, reset, reset_only, namespace): +def main(uc, loads, instances_list, partitions, cpu_limit, memory_limit, + commit_ms, duration, domain_restriction, search_strategy, + prometheus_base_url ,reset, reset_only, namespace): print(f"Domain restriction of search space activated: {domain_restriction}") print(f"Chosen search strategy: {search_strategy}") @@ -44,8 +46,8 @@ def main(uc, loads, instances_list, partitions, cpu_limit, memory_limit, commit_ separator = "," lines = [ f"UC={uc}\n", - f"DIM_VALUES={separator.join(loads)}\n", - f"REPLICAS={separator.join(instances_list)}\n", + f"DIM_VALUES={separator.join(map(str, loads))}\n", + f"REPLICAS={separator.join(map(str, instances_list))}\n", f"PARTITIONS={partitions}\n", f"CPU_LIMIT={cpu_limit}\n", f"MEMORY_LIMIT={memory_limit}\n", @@ -174,5 +176,5 @@ if __name__ == '__main__': args = load_variables() main(args.uc, args.loads, args.instances_list, args.partitions, args.cpu_limit, args.memory_limit, args.commit_ms, args.duration, - args.domain_restriction, args.search_strategy, args.reset, - args.reset_only, args.namespace) + args.domain_restriction, args.search_strategy, args.prometheus, + args.reset, args.reset_only, args.namespace)