redisbench-admin 0.11.56__tar.gz → 0.11.57__tar.gz

{redisbench_admin-0.11.56 → redisbench_admin-0.11.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redisbench-admin
-Version: 0.11.56
+Version: 0.11.57
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 License-File: LICENSE
 Author: filipecosta90

{redisbench_admin-0.11.56 → redisbench_admin-0.11.57}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.56"
+version = "0.11.57"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "README.md"

{redisbench_admin-0.11.56 → redisbench_admin-0.11.57}/redisbench_admin/run_remote/remote_helpers.py

@@ -205,8 +205,7 @@ def remote_tool_pre_bench_step(
         )
     logging.info("Finished up remote tool {} requirements".format(benchmark_tool))
 
-
-def setup_remote_benchmark_tool_requirements_ftsb(
+def _setup_remote_benchmark_tool_requirements(
     client_public_ip,
     username,
     private_key,
@@ -218,14 +217,43 @@ def setup_remote_benchmark_tool_requirements_ftsb(
 ):
     commands = [
         "wget {} -q -O {}".format(tool_link, remote_tool_link),
-        "wget {} -q -O {}".format(queries_file_link, remote_input_file),
-        "chmod 755 {}".format(remote_tool_link),
+        "chmod 755 {}".format(remote_tool_link)
     ]
+
+    # detect if queries_file_link is a s3 URI or http one and act accordingly (use aws cli or wget)
+    if queries_file_link.startswith("s3://"):
+        commands.append(
+            "aws s3 cp {} {} --no-sign-request".format(queries_file_link, remote_input_file)
+        )
+    else:
+        commands.append("wget {} -q -O {}".format(queries_file_link, remote_input_file))
     execute_remote_commands(
         client_public_ip, username, private_key, commands, client_ssh_port
     )
 
 
+def setup_remote_benchmark_tool_requirements_ftsb(
+    client_public_ip,
+    username,
+    private_key,
+    tool_link,
+    queries_file_link,
+    remote_tool_link,
+    remote_input_file,
+    client_ssh_port,
+):
+    _setup_remote_benchmark_tool_requirements(
+        client_public_ip,
+        username,
+        private_key,
+        tool_link,
+        queries_file_link,
+        remote_tool_link,
+        remote_input_file,
+        client_ssh_port,
+    )
+
+
 def setup_remote_benchmark_tool_requirements_tsbs(
     client_public_ip,
     username,
@@ -236,13 +264,15 @@ def setup_remote_benchmark_tool_requirements_tsbs(
     remote_input_file,
     client_ssh_port,
 ):
-    commands = [
-        "wget {} -q -O {}".format(tool_link, remote_tool_link),
-        "wget {} -q -O {}".format(queries_file_link, remote_input_file),
-        "chmod 755 {}".format(remote_tool_link),
-    ]
-    execute_remote_commands(
-        client_public_ip, username, private_key, commands, client_ssh_port
+    _setup_remote_benchmark_tool_requirements(
+        client_public_ip,
+        username,
+        private_key,
+        tool_link,
+        queries_file_link,
+        remote_tool_link,
+        remote_input_file,
+        client_ssh_port,
     )
 
 

{redisbench_admin-0.11.56 → redisbench_admin-0.11.57}/redisbench_admin/utils/remote.py

@@ -178,6 +178,8 @@ def connect_remote_ssh(port, private_key, server_public_ip, username):
     c.set_missing_host_key_policy(paramiko.AutoAddPolicy())
     logging.info("Connecting to remote server {}".format(server_public_ip))
     c.connect(hostname=server_public_ip, port=port, username=username, pkey=k)
+    transport = c.get_transport()
+    transport.set_keepalive(10)  # Send keepalive every 10 seconds
     logging.info("Connected to remote server {}".format(server_public_ip))
     return c