redisbench-admin 0.11.25__tar.gz → 0.11.27__tar.gz

{redisbench_admin-0.11.25 → redisbench_admin-0.11.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.25
+Version: 0.11.27
 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.25 → redisbench_admin-0.11.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.25"
+version = "0.11.27"
 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.25 → redisbench_admin-0.11.27}/redisbench_admin/run/common.py

@@ -716,7 +716,7 @@ def dbconfig_keyspacelen_check(
     attempt = 0
     while time.time() - start_time < timeout:
         logging.info(
-            f"Ensuring keyspace length requirement = {keyspacelen} is met. attempt #{attempt+1}"
+            f"Ensuring keyspace length requirement = {keyspacelen} is met. attempt #{attempt + 1}"
         )
         total_keys = 0
         for shard_conn in redis_conns:
@@ -741,12 +741,12 @@ def dbconfig_keyspacelen_check(
         attempt += 1
 
     logging.error(
-        f"The total number of keys in setup does not match the expected spec: {keyspacelen} != {total_keys}. Aborting after {attempt+1} tries..."
+        f"The total number of keys in setup does not match the expected spec: {keyspacelen} != {total_keys}. Aborting after {attempt + 1} tries..."
     )
 
     if not ignore_keyspace_errors:
         raise Exception(
-            f"The total number of keys in setup does not match the expected spec: {keyspacelen} != {total_keys}. Aborting after {attempt+1} tries..."
+            f"The total number of keys in setup does not match the expected spec: {keyspacelen} != {total_keys}. Aborting after {attempt + 1} tries..."
         )
 
     return False

{redisbench_admin-0.11.25 → redisbench_admin-0.11.27}/redisbench_admin/run_remote/remote_env.py

@@ -7,7 +7,7 @@ import logging
 
 from python_terraform import TerraformCommandError
 
-from redisbench_admin.run.args import ARCH_X86, ARCH_ARM
+from redisbench_admin.run.args import ARCH_X86
 from redisbench_admin.run_remote.terraform import (
     retrieve_inventory_info,
     terraform_spin_or_reuse_env,
@@ -40,17 +40,8 @@ def remote_env_setup(
     db_ssh_port = args.db_ssh_port
     client_ssh_port = args.client_ssh_port
     username = args.user
-    logging.info(f"specified arch for deployment {architecture}")
-    if architecture != ARCH_X86 and tf_folder_path is not None:
-        logging.info(
-            f"Checking if the architecture info is specified on the terraform path {tf_folder_path}"
-        )
-        if architecture is ARCH_ARM and ARCH_ARM not in tf_folder_path:
-            logging.info(f"adding suffix '-{ARCH_ARM}' to {tf_folder_path}")
-            tf_folder_path = "{tf_folder_path}-{ARCH_ARM}"
-        else:
-            logging.info(f"'-{ARCH_ARM}' suffix already in {tf_folder_path}")
 
+    logging.info(f"specified arch for deployment {architecture}")
     if args.inventory is not None:
         logging.info(
             f"inventory info passed. avoiding to deploy using terraform {args.inventory}"
@@ -101,6 +92,7 @@ def remote_env_setup(
                         tf_timeout_secs,
                         tf_override_name,
                         tf_folder_spot_path,
+                        architecture,
                     )
                     spot_available_and_used = True
                     spot_price_counter = spot_price_counter + 1
@@ -139,6 +131,7 @@ def remote_env_setup(
                 tf_timeout_secs,
                 tf_override_name,
                 tf_folder_path,
+                architecture,
             )
             full_price_counter = full_price_counter + 1
     logging.info("Using the following connection addresses.")

{redisbench_admin-0.11.25 → redisbench_admin-0.11.27}/redisbench_admin/run_remote/terraform.py

@@ -44,9 +44,7 @@ def terraform_spin_or_reuse_env(
         architecture,
     )
     logging.info(
-        "Repetition {} of {}. Deploying test {} on AWS using {}".format(
-            repetition, BENCHMARK_REPETITIONS, test_name, remote_setup
-        )
+        f"Repetition {repetition} of {BENCHMARK_REPETITIONS}. Deploying test {test_name} on AWS using (architecture={architecture}) {remote_setup}"
     )
     if tf_override_name is None:
         tf_setup_name = "{}{}".format(remote_setup, tf_setup_name_sufix)

{redisbench_admin-0.11.25 → redisbench_admin-0.11.27}/redisbench_admin/utils/remote.py

@@ -9,7 +9,7 @@ import logging
 import os
 import sys
 import tempfile
-
+import time
 import git
 import paramiko
 import pysftp
@@ -276,7 +276,9 @@ def setup_remote_environment(
     _, _, _ = tf.init(
         capture_output=True,
         backend_config={
-            "key": "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name)
+            "key": "benchmarks/infrastructure/{}.tfstate".format(
+                tf_setup_name.replace("/", "-")
+            )
         },
     )
     _, _, _ = tf.refresh()
@@ -312,6 +314,9 @@ def setup_remote_environment(
         },
         raise_on_error=True,
     )
+    infra_wait_secs = 60
+    logging.warning("Infra ready wait... for {infra_wait_secs} secs")
+    time.sleep(infra_wait_secs)
     return retrieve_tf_connection_vars(return_code, tf)
 
 
@@ -582,6 +587,7 @@ def fetch_remote_setup_from_config(
     architecture=ARCH_X86,
 ):
     setup_type = "oss-standalone"
+    logging.info(f"fetch_remote_setup_from_config, architecture={architecture}")
     setup = None
     if path is None:
         for remote_setup_property in remote_setup_config:
@@ -595,7 +601,7 @@ def fetch_remote_setup_from_config(
         logging.info(
             f"Checking if the architecture info is specified on the terraform path {path}"
         )
-        if architecture is ARCH_ARM and ARCH_ARM not in path:
+        if architecture == ARCH_ARM and ARCH_ARM not in path:
             logging.info(f"adding suffix '-{ARCH_ARM}' to {path}")
             path = f"{path}-{ARCH_ARM}"
         else: