Skip to content

Commit acca224

Browse files
[fix] Ensuring a clean environment is used when multiple tests share the same remote machines (#179)
1 parent 2c1a1f3 commit acca224

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redisbench-admin"
3-
version = "0.4.5"
3+
version = "0.4.6"
44
description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
55
authors = ["filipecosta90 <[email protected]>"]
66
readme = "README.md"

redisbench_admin/run_remote/run_remote.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
get_run_full_filename,
6060
get_overall_dashboard_keynames,
6161
check_ec2_env,
62+
execute_remote_commands,
6263
)
6364

6465
from redisbench_admin.utils.utils import (
@@ -199,6 +200,19 @@ def run_remote_command_logic(args, project_name, project_version):
199200
# after we've created the env, even on error we should always teardown
200201
# in case of some unexpected error we fail the test
201202
try:
203+
# ensure /tmp folder is free of benchmark data from previous runs
204+
remote_working_folder = "/tmp"
205+
execute_remote_commands(
206+
server_public_ip,
207+
username,
208+
private_key,
209+
[
210+
"rm -rf {}/*.log".format(remote_working_folder),
211+
"rm -rf {}/*.rdb".format(remote_working_folder),
212+
"rm -rf {}/*.out".format(remote_working_folder),
213+
"rm -rf {}/*.data".format(remote_working_folder),
214+
],
215+
)
202216
_, _, testcase_start_time_str = get_start_time_vars()
203217
logname = "{}_{}.log".format(
204218
test_name, testcase_start_time_str
@@ -287,6 +301,7 @@ def run_remote_command_logic(args, project_name, project_version):
287301
result = wait_for_conn(
288302
local_redis_conn, dataset_load_timeout_secs
289303
)
304+
logging.info("Starting dataset loading...")
290305
dataset_load_end_time = datetime.datetime.now()
291306
if result is True:
292307
logging.info("Redis available")

0 commit comments

Comments
 (0)