refactor: enhance parameter handling in execution scripts for improved flexibility

Author: takasehideki

manager_scripts/rest_server.py

@@ -130,40 +130,38 @@ def start_script():
     body = request.get_json(silent=True) or {}
     payload_size = body.get("payload_size")
     run_idx = body.get("run_idx", 1)
-    period_ms = body.get("period_ms", 100)
-    eval_time = body.get("eval_time", 60)
-
-    if payload_size is None:
-        return jsonify({"error": "payload_size required"}), 400
+    period_ms = body.get("period_ms")
+    eval_time = body.get("eval_time")
 
     try:
-        payload_size = _to_int(payload_size, "payload_size")
         run_idx = _to_int(run_idx, "run_idx")
-        period_ms = _to_int(period_ms, "period_ms")
-        eval_time = _to_int(eval_time, "eval_time")
+        if payload_size is not None:
+            payload_size = _to_int(payload_size, "payload_size")
+        if period_ms is not None:
+            period_ms = _to_int(period_ms, "period_ms")
+        if eval_time is not None:
+            eval_time = _to_int(eval_time, "eval_time")
 
         ctx = _resolve_exec_context(body)
         resolved_host, script_path = _resolve_host_script(
             ctx["exec_dir"], ctx["hosts"], "exec.sh")
 
+        effective_payload_size = payload_size if payload_size is not None else 64
         log_dir = os.path.join(
             REPO_ROOT,
             "logs",
-            f"raw_{payload_size}B",
+            f"raw_{effective_payload_size}B",
             f"run{run_idx}",
         )
         os.makedirs(log_dir, exist_ok=True)
 
-        cmd = [
-            "bash",
-            script_path,
-            "--payload-size",
-            str(payload_size),
-            "--period-ms",
-            str(period_ms),
-            "--eval-time",
-            str(eval_time),
-        ]
+        cmd = ["bash", script_path]
+        if payload_size is not None:
+            cmd.extend(["--payload-size", str(payload_size)])
+        if period_ms is not None:
+            cmd.extend(["--period-ms", str(period_ms)])
+        if eval_time is not None:
+            cmd.extend(["--eval-time", str(eval_time)])
 
         env = os.environ.copy()
         env["LOG_DIR"] = log_dir
@@ -193,34 +191,30 @@ def start_docker():
     body = request.get_json(silent=True) or {}
     payload_size = body.get("payload_size")
     run_idx = body.get("run_idx", 1)
-    period_ms = body.get("period_ms", 100)
-    eval_time = body.get("eval_time", 60)
-
-    if payload_size is None:
-        return jsonify({"error": "payload_size required"}), 400
+    period_ms = body.get("period_ms")
+    eval_time = body.get("eval_time")
 
     try:
-        payload_size = _to_int(payload_size, "payload_size")
         run_idx = _to_int(run_idx, "run_idx")
-        period_ms = _to_int(period_ms, "period_ms")
-        eval_time = _to_int(eval_time, "eval_time")
+        if payload_size is not None:
+            payload_size = _to_int(payload_size, "payload_size")
+        if period_ms is not None:
+            period_ms = _to_int(period_ms, "period_ms")
+        if eval_time is not None:
+            eval_time = _to_int(eval_time, "eval_time")
 
         ctx = _resolve_exec_context(body)
         resolved_host, script_path = _resolve_host_script(
             ctx["exec_dir"], ctx["hosts"], "run.sh")
 
-        cmd = [
-            "bash",
-            script_path,
-            "--payload-size",
-            str(payload_size),
-            "--period-ms",
-            str(period_ms),
-            "--eval-time",
-            str(eval_time),
-            "--run-idx",
-            str(run_idx),
-        ]
+        cmd = ["bash", script_path]
+        if payload_size is not None:
+            cmd.extend(["--payload-size", str(payload_size)])
+        if period_ms is not None:
+            cmd.extend(["--period-ms", str(period_ms)])
+        if eval_time is not None:
+            cmd.extend(["--eval-time", str(eval_time)])
+        cmd.extend(["--run-idx", str(run_idx)])
 
         app.logger.info(
             "[start_docker] host=%s scenario=%s payload=%s run=%s script=%s",

manager_scripts/start_exec_scripts.py

@@ -120,6 +120,11 @@ def main():
         print("ERROR: No hosts to process", file=sys.stderr)
         sys.exit(1)
 
+    # Read test parameters from environment only when explicitly provided.
+    payload_size = os.environ.get("PAYLOAD_SIZE")
+    period_ms = os.environ.get("PERIOD_MS")
+    eval_time = os.environ.get("EVAL_TIME")
+
     # Determine endpoint and timeout based on mode
     if args.docker:
         endpoint = "/start_docker"
@@ -128,25 +133,35 @@ def main():
     else:
         endpoint = "/start"
         timeout = 100  # seconds
-        print(f"Using native mode: {endpoint} endpoint with timeout {timeout}s")
+        print(
+            f"Using native mode: {endpoint} endpoint with timeout {timeout}s")
 
     failed_hosts = []
     lock = threading.Lock()
 
     def start(host):
         try:
             if args.docker:
-                print(f"{host}: sending {endpoint} request (Docker mode)...", flush=True)
+                print(
+                    f"{host}: sending {endpoint} request (Docker mode)...", flush=True)
             else:
                 print(f"{host}: sending {endpoint} request...", flush=True)
 
+            request_body = {
+                "run_idx": run_idx,
+                "ws_dir": ws_dir,
+                "scenario": scenario,
+            }
+            if payload_size is not None:
+                request_body["payload_size"] = payload_size
+            if period_ms is not None:
+                request_body["period_ms"] = period_ms
+            if eval_time is not None:
+                request_body["eval_time"] = eval_time
+
             r = requests.post(
                 f"http://{host}:5000{endpoint}",
-                json={
-                    "run_idx": run_idx,
-                    "ws_dir": ws_dir,
-                    "scenario": scenario,
-                },
+                json=request_body,
                 timeout=timeout,
             )
             if r.status_code < 200 or r.status_code >= 300:
@@ -174,7 +189,8 @@ def start(host):
 
     # Check for failures
     if failed_hosts:
-        print(f"ERROR: {len(failed_hosts)}/{len(hosts)} host(s) failed: {failed_hosts}", file=sys.stderr)
+        print(
+            f"ERROR: {len(failed_hosts)}/{len(hosts)} host(s) failed: {failed_hosts}", file=sys.stderr)
         sys.exit(1)
 
     print(f"Successfully started on all {len(hosts)} hosts")

performance_test/performance_test.py

@@ -446,6 +446,13 @@ def agg(a):
     )
     args = parser.parse_args()
 
+    # Forward optional overrides only when explicitly requested.
+    requested_payload_size = args.payload_size
+    payload_sizes = [
+        requested_payload_size if requested_payload_size is not None else 64]
+    period_ms = args.period_ms
+    eval_time = args.eval_time
+
     base_log_dir = "./logs"
     base_result_dir = "./results"
     os.makedirs(base_log_dir, exist_ok=True)
@@ -469,8 +476,8 @@ def agg(a):
         sys.exit(1)
     print(f"Using hosts: {hosts}")
     print(f"Note: payload_size, period_ms, eval_time are determined by run.sh defaults")
-    for payload_size in payload_sizes:
-        print(f"=== Payload size: {payload_size}B ===")
+    for result_payload_size in payload_sizes:
+        print(f"=== Payload size: {result_payload_size}B ===")
         for run_idx in range(args.trials):
             run_test(
                 run_idx,
@@ -479,7 +486,7 @@ def agg(a):
                 args.ws_dir,
                 args.scenario,
                 docker=args.docker,
-                payload_size=payload_size,
+                payload_size=requested_payload_size,
                 period_ms=period_ms,
                 eval_time=eval_time,
             )
@@ -488,7 +495,7 @@ def agg(a):
             base_log_dir,
             base_result_dir,
             prefix,
-            payload_size,
+            result_payload_size,
             args.trials,
             hosts,
             period_ms=period_ms,
@@ -501,7 +508,6 @@ def agg(a):
     # --- ここから全ペイロードサイズの集計CSVをまとめる処理 ---
     summary_rows = []
     header = None
-    payload_sizes = [payload_size]  # Use the payload_size from CLI or default
     for payload_size in payload_sizes:
         latest_dir = f"{prefix}_{payload_size}B"
         csv_path = os.path.join(