redisbench-admin 0.11.14__py3-none-any.whl → 0.11.16__py3-none-any.whl

redisbench_admin/run/ssh.py

@@ -70,6 +70,19 @@ def check_connection(ssh_conn):
         return False
 
 
+def ensure_400_permissions(file_path):
+    import stat
+
+    file_stat = os.stat(file_path)
+    current_permissions = stat.S_IMODE(file_stat.st_mode)
+
+    if current_permissions != 0o400:
+        logging.info(f"Changing permissions of {file_path} to 400")
+        os.chmod(file_path, 0o400)
+    else:
+        logging.info(f"{file_path} already has 400 permissions.")
+
+
 def ssh_pem_check(EC2_PRIVATE_PEM, private_key):
     if os.path.exists(private_key) is False:
         if EC2_PRIVATE_PEM is not None and EC2_PRIVATE_PEM != "":
@@ -90,3 +103,4 @@ def ssh_pem_check(EC2_PRIVATE_PEM, private_key):
         logging.info(
             "Confirmed that private key path artifact: '{}' exists!".format(private_key)
         )
+    ensure_400_permissions(private_key)

redisbench_admin/utils/remote.py

@@ -158,15 +158,41 @@ def execute_remote_commands(
 
 
 def connect_remote_ssh(port, private_key, server_public_ip, username):
+    import time
+
     k = paramiko.RSAKey.from_private_key_file(private_key)
     c = paramiko.SSHClient()
     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, timeout=300
+
+    max_retries = 10
+    base_delay = 2  # Initial backoff time in seconds
+    max_delay = 90  # Maximum delay in seconds
+
+    for attempt in range(max_retries):
+        try:
+            logging.info(
+                f"Connecting to remote server {server_public_ip}, attempt {attempt + 1}"
+            )
+            c.connect(
+                hostname=server_public_ip,
+                port=port,
+                username=username,
+                pkey=k,
+                timeout=300,
+            )
+            logging.info(f"Connected to remote server {server_public_ip}")
+            return c
+        except paramiko.ssh_exception.NoValidConnectionsError as e:
+            wait_time = min(base_delay * (2**attempt), max_delay)
+            logging.warning(
+                f"Connection attempt {attempt + 1} failed: {e}. Retrying in {wait_time} seconds..."
+            )
+            time.sleep(wait_time)
+
+    logging.error("Failed to connect after multiple attempts.")
+    raise paramiko.ssh_exception.NoValidConnectionsError(
+        f"Could not connect to {server_public_ip} after {max_retries} attempts."
     )
-    logging.info("Connected to remote server {}".format(server_public_ip))
-    return c
 
 
 def check_dataset_remote_requirements(

{redisbench_admin-0.11.14.dist-info → redisbench_admin-0.11.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.14
+Version: 0.11.16
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com

{redisbench_admin-0.11.14.dist-info → redisbench_admin-0.11.16.dist-info}/RECORD

@@ -192,7 +192,7 @@ redisbench_admin/run/redisgraph_benchmark_go/redisgraph_benchmark_go.py,sha256=D
 redisbench_admin/run/redistimeseries.py,sha256=x3PA7QoHXu53zs5v0ekK2sVmUnA9_ZF2JxgCDf1Mui4,21331
 redisbench_admin/run/run.py,sha256=WIBc1q5198Ln3Elfgk6D1_ezuAKx5kM_xsxnxGe66-I,5586
 redisbench_admin/run/s3.py,sha256=pXQXZ1rrwDCWeBegGR4aKzbKqWWwMrmqvIjFxEB3bh4,442
-redisbench_admin/run/ssh.py,sha256=dE1NhIh5eF00Saay3G_wjgiLuNOBUFqjbejEWZjOFLc,2861
+redisbench_admin/run/ssh.py,sha256=vLesv-a1Ze7Prb8rCnquBbLS1Svj-EZtrSs36RbVHro,3269
 redisbench_admin/run/tsbs_run_queries_redistimeseries/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/tsbs_run_queries_redistimeseries/tsbs_run_queries_redistimeseries.py,sha256=9JWh23vG_4pNZuv6-kVk7_5C6qJ2ZOBWv53LxGMKXgs,2426
 redisbench_admin/run/ycsb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -228,15 +228,15 @@ redisbench_admin/utils/benchmark_config.py,sha256=sVhS2c3p4lBMga0g3U-S9rF8pntcI4
 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=ajZ8bCL5pi8ILcWGSomOvZK8H8Uh7QHVWkdE6F77f5o,39415
+redisbench_admin/utils/remote.py,sha256=0ZJ4-ygfbciALa8DuYy-6MORFKSoalbFcH04Lm8Oaog,40279
 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=nQkN3N2iVhoe2GlRxU3BBaicrtw5vZXFaqnstc4i2Fc,14034
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=NiveQyTq22ZCrZoPJYskP9s5MMLRXq9xCGdBwEMNMxg,6225
-redisbench_admin-0.11.14.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.14.dist-info/METADATA,sha256=CDyMvMYyAnvc06pLIQ3MCP1N7g98ONcrJuLePIrwQlQ,5438
-redisbench_admin-0.11.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.14.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.14.dist-info/RECORD,,
+redisbench_admin-0.11.16.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.16.dist-info/METADATA,sha256=7be1EWel3Nqe7V_IJjPUZlb57sbKCxg12c2xYm7DFys,5438
+redisbench_admin-0.11.16.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.16.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.16.dist-info/RECORD,,