From 715f65c1a0965325046b84ec0504def761127732 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Tue, 3 Aug 2021 20:13:28 +0100 Subject: [PATCH 1/2] [fix] Shutting down remote redis properly --- pyproject.toml | 2 +- redisbench_admin/cli.py | 2 +- redisbench_admin/run_remote/run_remote.py | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fc4477e..c7599b9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "redisbench-admin" -version = "0.4.1" +version = "0.4.2" description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )." authors = ["filipecosta90 "] readme = "README.md" diff --git a/redisbench_admin/cli.py b/redisbench_admin/cli.py index d25484e..ab32e0d 100644 --- a/redisbench_admin/cli.py +++ b/redisbench_admin/cli.py @@ -27,7 +27,7 @@ LOG_LEVEL = logging.DEBUG -if os.getenv("VERBOSE", "1") == "0": +if os.getenv("VERBOSE", "0") == "0": LOG_LEVEL = logging.INFO LOG_FORMAT = "%(asctime)s %(levelname)-4s %(message)s" LOG_DATEFMT = "%Y-%m-%d %H:%M:%S" diff --git a/redisbench_admin/run_remote/run_remote.py b/redisbench_admin/run_remote/run_remote.py index fbd67b1..bd5e17c 100644 --- a/redisbench_admin/run_remote/run_remote.py +++ b/redisbench_admin/run_remote/run_remote.py @@ -321,8 +321,6 @@ def run_remote_command_logic(args, project_name, project_version): benchmark_config, local_redis_conn, required_modules ) - ssh_tunnel.close() # Close the tunnel - ( benchmark_min_tool_version, benchmark_min_tool_version_major, @@ -392,6 +390,10 @@ def run_remote_command_logic(args, project_name, project_version): command_str, ) benchmark_end_time = datetime.datetime.now() + + logging.info("Shutting down remote redis.") + local_redis_conn.shutdown(save=False) + ssh_tunnel.close() # Close the tunnel if remote_run_result is False: failed_remote_run_artifact_store( args, From 452f4c8a17f4353b1e3f9a0e3c386b10e7a8bb11 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Wed, 4 Aug 2021 09:19:59 +0100 Subject: [PATCH 2/2] [fix] Temporary disable oss-cluster spinning on remote runners --- pyproject.toml | 2 +- redisbench_admin/run/cluster.py | 2 +- redisbench_admin/run_remote/run_remote.py | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c7599b9..4206c78 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "redisbench-admin" -version = "0.4.2" +version = "0.4.3" description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )." authors = ["filipecosta90 "] readme = "README.md" diff --git a/redisbench_admin/run/cluster.py b/redisbench_admin/run/cluster.py index 82bcd84..63eb357 100644 --- a/redisbench_admin/run/cluster.py +++ b/redisbench_admin/run/cluster.py @@ -79,6 +79,6 @@ def spin_up_redis_cluster_remote_redis( shard_count, port, ): - raise Exception( + logging.error( "Remote cluster is still not implemented =(. We're working hard to get it ASAP =)!!" ) diff --git a/redisbench_admin/run_remote/run_remote.py b/redisbench_admin/run_remote/run_remote.py index bd5e17c..2b07975 100644 --- a/redisbench_admin/run_remote/run_remote.py +++ b/redisbench_admin/run_remote/run_remote.py @@ -217,8 +217,13 @@ def run_remote_command_logic(args, project_name, project_version): ) cluster_api_enabled = False + cluster_start_port = 20000 # setup Redis if setup_type == "oss-cluster": + logging.error( + "Remote cluster is still not implemented =(. We're working hard to get it ASAP =)!!" + ) + continue cluster_api_enabled = True spin_up_redis_cluster_remote_redis( benchmark_config, @@ -233,19 +238,21 @@ def run_remote_command_logic(args, project_name, project_version): redis_configuration_parameters, dbdir_folder, shard_count, - args.port, + cluster_start_port, ) dataset_load_start_time = datetime.datetime.now() # we use node 0 for the checks local_redis_conn = ssh_tunnel_redisconn( - args.port, + cluster_start_port, server_private_ip, server_public_ip, username, ) r_conns = [] - for p in range(args.port, args.port + shard_count): + for p in range( + cluster_start_port, cluster_start_port + shard_count + ): local_redis_conn, ssh_tunnel = ssh_tunnel_redisconn( p, server_private_ip,