redisbench-admin 0.11.56__py3-none-any.whl → 0.11.57__py3-none-any.whl

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/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
 

{redisbench_admin-0.11.56.dist-info → redisbench_admin-0.11.57.dist-info}/METADATA

@@ -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.dist-info → redisbench_admin-0.11.57.dist-info}/RECORD

@@ -94,7 +94,7 @@ redisbench_admin/run_remote/remote_client.py,sha256=rRmDro1weto01wzqYpId8NMPoizE
 redisbench_admin/run_remote/remote_db.py,sha256=EEDeiOZk-godr5EINscEkOJLGWUN3gFfH6RaBzAKbak,14566
 redisbench_admin/run_remote/remote_env.py,sha256=Ux_0QT1unNRlKl3cakzjG5Px1uuxOOfBoF_pnalx_T8,4936
 redisbench_admin/run_remote/remote_failures.py,sha256=IOo6DyxarcwwMPCeN4gWB2JrhuC9iBLwq0nCROqr5ak,1567
-redisbench_admin/run_remote/remote_helpers.py,sha256=skWeGyDJBmyx_UwUekT3N3_nOJvF2-Hvu-E7vKlO9gg,10598
+redisbench_admin/run_remote/remote_helpers.py,sha256=OEFjbdqG_FJ5KY6B63jYr21vPomtM3ld_F9MsGRTaCU,11271
 redisbench_admin/run_remote/run_remote.py,sha256=tZqCu1fTfB5gWooVIEsSDoaVfnVRfxeCpn-RLmYI3IM,75476
 redisbench_admin/run_remote/standalone.py,sha256=WRgiY8oMJwDUPht1LAPG9tnOLvhJmhRvVOi3GBnMoX4,27952
 redisbench_admin/run_remote/terraform.py,sha256=vV3eWXNwj7vsnFNqUgCir5ueZS4VYopEyzWiTtoSq0Q,4018
@@ -103,15 +103,15 @@ redisbench_admin/utils/benchmark_config.py,sha256=bC2C6rnj89wkkSlOXyyfe0N15unn_M
 redisbench_admin/utils/local.py,sha256=zUvyVI9LZMT3qyxs1pO3mXL6Bt_1z9EZUGppaRcWNRA,3890
 redisbench_admin/utils/redisearch.py,sha256=lchUEzpt0zB1rHwlDlw9LLifAnxFWcLP-PePw7TjL-0,1602
 redisbench_admin/utils/redisgraph_benchmark_go.py,sha256=os7EJt6kBxsFJLKkSoANbjMT7-cEq4-Ns-49alk2Tf8,2048
-redisbench_admin/utils/remote.py,sha256=RAQ2VxfmlK7swN7ujCuwSI2soGSycjnxbQw_IrLxIFE,42205
+redisbench_admin/utils/remote.py,sha256=MsRL6x-eekzJOVE6Ho05igZzUX54m-4fRVCQlSYxyw0,42306
 redisbench_admin/utils/results.py,sha256=uKk3uNJ--bSXlUj_HGQ2OaV6MVqmXJVM8xTzFV6EOw4,3267
 redisbench_admin/utils/ssh.py,sha256=QW4AwlocMHJt05QMdN_4f8WeDmxiEwR80ny8VBThq6k,6533
 redisbench_admin/utils/utils.py,sha256=XVSvo1_DdcYwk2jOxL3VPVPbnDnhGYt8ieYfANo6rTo,15085
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=0wWYge3x_OMxWrzazNhJif2NK4tKsI963HVZqjczRag,6189
-redisbench_admin-0.11.56.dist-info/METADATA,sha256=wxAuRSDGZqqFHiamBoQhtv8Zh3sX3yHa1XzCdEACoSo,5724
-redisbench_admin-0.11.56.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-redisbench_admin-0.11.56.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.56.dist-info/licenses/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.56.dist-info/RECORD,,
+redisbench_admin-0.11.57.dist-info/METADATA,sha256=2T9Tvwug0CQlh1ueoikzvMk4sBlqjL2JP9argPeR25A,5724
+redisbench_admin-0.11.57.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+redisbench_admin-0.11.57.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.57.dist-info/licenses/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.57.dist-info/RECORD,,