Commit 7b68ee73 authored by Florian Fischer's avatar Florian Fischer
Browse files

[eval.py] seperate between remote_cmd for the server and for the clients

parent 6696678c
......@@ -118,11 +118,10 @@ def bench(server_cmds) -> EvalResult:
'SERVER': server_name
}
remote_cmd = None if not REMOTE_CMD else REMOTE_CMD.format(
host='{host}', ssh_port=SSH_PORT)
if remote_cmd:
if REMOTE_CMD:
# make sure the benchdir is available on the HOST
remote_prepare_cmd = f'{remote_cmd.format(host=HOST)} mkdir -p {bench_dir}'
remote_cmd = REMOTE_CMD.format(host=HOST, ssh_port=SSH_PORT)
remote_prepare_cmd = f'{remote_cmd} mkdir -p {bench_dir}'
cmd_run(remote_prepare_cmd, log)
measure_cmd = MEASURE_CMD.format(**substitutions)
......@@ -134,7 +133,7 @@ def bench(server_cmds) -> EvalResult:
bench_dir,
env=SERVER_ENV,
measure_cmd=measure_cmd,
remote_cmd=remote_cmd.format(host=HOST),
remote_cmd=remote_cmd if REMOTE_CMD else None,
host=HOST)
sleep(STARTUP_TIME)
......@@ -168,13 +167,15 @@ def bench(server_cmds) -> EvalResult:
cwd=bench_dir)
client_args = {'cons': cons, 'size': size}
client_remote_cmd = None if not REMOTE_CMD else REMOTE_CMD.format(
host='{host}', ssh_port=SSH_PORT)
bench_results[i] = run_clients(run,
client_args,
bench_dir,
HOST,
substitutions=substitutions,
termination=TERMINATION,
remote_cmd=remote_cmd,
remote_cmd=client_remote_cmd,
hosts=CLIENTS,
env=CLIENT_ENV)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment