redisbench-admin 0.11.14__tar.gz → 0.11.16__tar.gz

{redisbench_admin-0.11.14 → redisbench_admin-0.11.16}/PKG-INFO

@@ -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 → redisbench_admin-0.11.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.14"
+version = "0.11.16"
 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.14 → redisbench_admin-0.11.16}/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-0.11.14 → redisbench_admin-0.11.16}/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(