Skip to content

Commit 1dc5cfa

Browse files
committed
refactor: update paths for runtime logs
1 parent a3a20ed commit 1dc5cfa

6 files changed

Lines changed: 13 additions & 12 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Example:
251251
```
252252

253253
If SSH startup or readiness check fails on any Host, this command exits with a non-zero status.
254-
The REST server log is stored on each Host under `<remote-repo-base>/<ws-dir>/<topology>/results/runtime/rest_server.log`.
254+
The REST server log is stored on each Host under `<remote-repo-base>/<ws-dir>/<topology>/runtime_logs/rest_server.log`.
255255
For full subcommand and option details (including `wait`, `monitor`, `logs`, and related options), see [manager_scripts/README.md](./manager_scripts/README.md#manage_rest_serverssh).
256256

257257
If the server exits at startup with a chrony sudo permission error, check the chrony sudo setup in [Clock synchronization for REST benchmark (chrony)](#clock-synchronization-for-rest-benchmark-chrony).
@@ -398,7 +398,7 @@ On prepare, the Manager creates `<ws-dir>/<topology>/results/<session_timestamp>
398398
- Trial logs are collected under `<ws-dir>/<topology>/results/latest-<rmw>/raw_logs/trial<N>/`.
399399
- Aggregated outputs such as `total_latency.csv`, `throughput.csv`, `host_trials_usage.csv`, and `host_usage_summary.csv` are written under `<ws-dir>/<topology>/results/latest-<rmw>/analysis/`.
400400
- In `docker`/`native` modes, runtime service logs are collected under `<ws-dir>/<topology>/results/latest-<rmw>/runtime_logs/` (for example, `<host>_rest_server.log`; and `zenohd_router.log` for Zenoh router runs).
401-
- Note: `<host>_rest_server.log` is copied from the long-lived REST service log (`results/runtime/rest_server.log`), so it may include entries from earlier benchmark runs unless the REST server was restarted.
401+
- Note: `<host>_rest_server.log` is copied from the long-lived REST service log (`<ws-dir>/<topology>/runtime_logs/rest_server.log`), so it may include entries from earlier benchmark runs unless the REST server was restarted.
402402

403403
For details on output directory structure and CSV column definitions, see [performance_test/README.md](./performance_test/README.md).
404404

manager_scripts/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ If command execution or readiness check fails on any Host, the script exits with
120120

121121
Runtime log files created by this script are stored on each Host under:
122122

123-
- `<remote-repo-base>/<ws-dir>/<topology>/results/runtime/rest_server.log`
123+
- `<remote-repo-base>/<ws-dir>/<topology>/runtime_logs/rest_server.log`
124124

125125
The `logs` subcommand reads `rest_server.log`.
126126
`start` / `stop` / `status` operate on the process listening on fixed REST port `5000` (no PID file management).

manager_scripts/manage_rest_servers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ if [[ -z "${HOSTS_LINE}" ]]; then
221221
exit 1
222222
fi
223223

224-
REMOTE_RUNTIME_DIR="${REMOTE_REPO_BASE}/${WS_DIR}/${TOPOLOGY_DIR}/results/runtime"
224+
REMOTE_RUNTIME_DIR="${REMOTE_REPO_BASE}/${WS_DIR}/${TOPOLOGY_DIR}/runtime_logs"
225225

226226
IFS=',' read -r -a HOSTS_RAW <<< "${HOSTS_LINE}"
227227
HOSTS=()

performance_test/README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@ Use this mode for CI or formal evaluations where partially valid totals are not
3030

3131
## Output Structure
3232

33-
`performance_test.py` creates run-scoped outputs under `<ws-dir>/<topology>/results/<timestamp>-<rmw>/`, and related tools may also manage shared runtime logs under `<ws-dir>/<topology>/results/runtime/`:
33+
`performance_test.py` creates run-scoped outputs under `<ws-dir>/<topology>/results/<timestamp>-<rmw>/`, and related tools may also manage shared runtime logs under `<ws-dir>/<topology>/runtime_logs/`:
3434

3535
```
36+
runtime_logs/
37+
├── rest_server.log # managed by manage_rest_servers.sh
38+
└── zenohd_router.log # created when rmw_zenohd is started natively
39+
3640
results/
3741
├── latest-fastdds -> 2026-04-26_13-21-45-fastdds/ # symlink per RMW
3842
├── latest-zenoh -> 2026-04-26_14-02-10-zenoh/
39-
├── runtime/
40-
│ ├── rest_server.log # managed by manage_rest_servers.sh
41-
│ └── zenohd_router.log # created when rmw_zenohd is started natively
4243
└── 2026-04-26_13-21-45-fastdds/
4344
├── system_perf/
4445
│ ├── chrony_check/
@@ -81,7 +82,7 @@ results/
8182
```
8283

8384
`runtime_logs/<host>_rest_server.log` is a snapshot copy of each Host's long-lived
84-
`results/runtime/rest_server.log`, so it may include entries from previous runs
85+
`<ws-dir>/<topology>/runtime_logs/rest_server.log`, so it may include entries from previous runs
8586
unless the REST server was restarted before benchmarking.
8687

8788
## CSV Formats

performance_test/runner.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def collect_runtime_logs(
292292

293293
remote_repo_root = os.environ.get("ROS2_PERF_REPO_ROOT", remote_repo_base)
294294
remote_runtime_dir = (
295-
f"{remote_repo_root}/{ws_dir}/{topology_name}/results/runtime"
295+
f"{remote_repo_root}/{ws_dir}/{topology_name}/runtime_logs"
296296
)
297297

298298
for host in hosts:
@@ -359,7 +359,7 @@ def collect_runtime_logs(
359359
dst = os.path.join(runtime_logs_dir, "zenohd_router.log")
360360
if exec_policy == "native":
361361
src = os.path.join(
362-
local_repo_root, ws_dir, topology_name, "results", "runtime", "zenohd_router.log"
362+
local_repo_root, ws_dir, topology_name, "runtime_logs", "zenohd_router.log"
363363
)
364364
if os.path.exists(src):
365365
shutil.copy2(src, dst)

performance_test/zenoh_runtime.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def build_config_override(connect_host):
7171

7272

7373
def _zenoh_router_runtime_dir(base_dir, ws_dir, topology_name):
74-
return os.path.join(base_dir, ws_dir, topology_name, "results", "runtime")
74+
return os.path.join(base_dir, ws_dir, topology_name, "runtime_logs")
7575

7676

7777
def _find_local_pid_by_port(port):

0 commit comments

Comments
 (0)