redisbench-admin 0.11.43__py3-none-any.whl → 0.11.44__py3-none-any.whl

redisbench_admin/run_remote/remote_db.py

@@ -105,6 +105,8 @@ def remote_db_spin(
     continue_on_module_check_error=False,
     keyspace_check_timeout=60,
     architecture="x86_64",
+    custom_redis_server_path=None,
+    custom_redis_conf_path=None,
 ):
     (
         _,
@@ -114,6 +116,13 @@ def remote_db_spin(
         modules_configuration_parameters_map,
     ) = extract_redis_dbconfig_parameters(benchmark_config, "dbconfig")
 
+    # Execute install_steps from dbconfig and clientconfig if present
+    from redisbench_admin.run_remote.standalone import execute_install_steps
+    if benchmark_config is not None:
+        execute_install_steps(
+            benchmark_config, server_public_ip, username, private_key, db_ssh_port
+        )
+
     full_logfiles = []
     cluster_enabled = False
     if setup_type == "oss-cluster":
@@ -207,6 +216,8 @@ def remote_db_spin(
                     db_ssh_port,
                     modules_configuration_parameters_map,
                     redis_7,
+                    custom_redis_server_path,
+                    custom_redis_conf_path,
                 )
                 full_logfiles.append(full_logfile)
             local_redis_conn, ssh_tunnel = ssh_tunnel_redisconn(

redisbench_admin/run_remote/run_remote.py

@@ -665,6 +665,8 @@ def run_remote_command_logic(args, project_name, project_version):
                                             continue_on_module_check_error,
                                             60,
                                             architecture,
+                                            args.redis_server_binary,
+                                            args.redis_conf,
                                         )
                                         if benchmark_type == "read-only":
                                             ro_benchmark_set(

redisbench_admin/run_remote/standalone.py

@@ -277,6 +277,8 @@ def spin_up_standalone_remote_redis(
     port=22,
     modules_configuration_parameters_map={},
     redis_7=True,
+    custom_redis_server_path=None,
+    custom_redis_conf_path=None,
 ):
     # Ensure redis-server is available before trying to start it
     ensure_redis_server_available(server_public_ip, username, private_key, port)
@@ -288,6 +290,8 @@ def spin_up_standalone_remote_redis(
         temporary_dir,
         modules_configuration_parameters_map,
         redis_7,
+        custom_redis_server_path=custom_redis_server_path,
+        custom_redis_conf_path=custom_redis_conf_path,
     )
 
     # start redis-server

redisbench_admin/utils/benchmark_config.py

@@ -75,11 +75,12 @@ def prepare_benchmark_definitions(args):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
+        default_dbconfig,
     ) = get_defaults(defaults_filename)
     for usecase_filename in files:
         with open(usecase_filename, "r", encoding="utf8") as stream:
             test_result, benchmark_config, test_name = get_final_benchmark_config(
-                default_kpis, default_remote, stream, usecase_filename
+                default_kpis, default_remote, stream, usecase_filename, default_dbconfig
             )
             result &= test_result
             if test_result:
@@ -116,6 +117,7 @@ def get_defaults(defaults_filename):
     default_remote = None
     default_specs = None
     cluster_config = None
+    default_dbconfig = None
     if os.path.exists(defaults_filename):
         with open(defaults_filename, "r") as stream:
             logging.info(
@@ -128,6 +130,7 @@ def get_defaults(defaults_filename):
                 exporter_timemetric_path,
                 default_specs,
                 cluster_config,
+                default_dbconfig,
             ) = process_default_yaml_properties_file(
                 default_kpis,
                 default_remote,
@@ -143,10 +146,11 @@ def get_defaults(defaults_filename):
         exporter_timemetric_path,
         default_specs,
         cluster_config,
+        default_dbconfig,
     )
 
 
-def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_filename):
+def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_filename, default_dbconfig=None):
     result = False
     benchmark_config = None
     test_name = None
@@ -163,6 +167,12 @@ def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_fil
             merge_default_and_specific_properties_dict_type(
                 benchmark_config, default_remote, kpis_keyname, usecase_filename
             )
+        # Merge dbconfig from defaults
+        dbconfig_keyname = "dbconfig"
+        if default_dbconfig is not None:
+            merge_default_and_specific_properties_dict_type(
+                benchmark_config, default_dbconfig, dbconfig_keyname, usecase_filename
+            )
         test_name = benchmark_config["name"]
         result = True
     except Exception as e:
@@ -285,6 +295,7 @@ def process_default_yaml_properties_file(
     default_config = yaml.safe_load(stream)
     default_specs = None
     cluster_config = None
+    default_dbconfig = None
     default_metrics, exporter_timemetric_path = extract_exporter_metrics(default_config)
     if "remote" in default_config:
         logging.info(
@@ -300,6 +311,13 @@ def process_default_yaml_properties_file(
             )
         )
         default_kpis = default_config["kpis"]
+    if "dbconfig" in default_config:
+        logging.info(
+            "Loading default DBCONFIG specifications from file: {}".format(
+                defaults_filename
+            )
+        )
+        default_dbconfig = default_config["dbconfig"]
     if "spec" in default_config:
         logging.info(
             "Loading default setup SPECs from file: {}".format(defaults_filename)
@@ -319,6 +337,7 @@ def process_default_yaml_properties_file(
         exporter_timemetric_path,
         default_specs,
         cluster_config,
+        default_dbconfig,
     )
 
 

{redisbench_admin-0.11.43.dist-info → redisbench_admin-0.11.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.43
+Version: 0.11.44
 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.43.dist-info → redisbench_admin-0.11.44.dist-info}/RECORD

@@ -216,15 +216,15 @@ redisbench_admin/run_remote/consts.py,sha256=bCMkwyeBD-EmOpoHKni7LjWy5WuaxGJhGhq
 redisbench_admin/run_remote/log.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/run_remote/notifications.py,sha256=-W9fLaftEFNfplBl2clHk37jbYxliDbHftQ62khN31k,2157
 redisbench_admin/run_remote/remote_client.py,sha256=rRmDro1weto01wzqYpId8NMPoizEzSyudXBCjYrBVMs,14128
-redisbench_admin/run_remote/remote_db.py,sha256=EEDeiOZk-godr5EINscEkOJLGWUN3gFfH6RaBzAKbak,14566
+redisbench_admin/run_remote/remote_db.py,sha256=atHs0QCoGKw2aJMNrYvFUSBW3789F6ZQWbTAgbzEgJc,15033
 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/run_remote.py,sha256=VSKPAh-ky8ihwtlx8k2ZTIkF-bV3h40LmZ7A9LvrTsE,76460
-redisbench_admin/run_remote/standalone.py,sha256=TY9kcie3cZEC72ApnZGzHpRu-2oYwnqvvHvpiIQbyMk,32703
+redisbench_admin/run_remote/run_remote.py,sha256=dAR2HRA6pl4jFdRM6YF1iAsLfuy1TZ8nn3s6QdOdv2k,76591
+redisbench_admin/run_remote/standalone.py,sha256=NF8Az9ZJfdRk6aP5_t8MxraUkpGRU_OYae3w93NngiA,32885
 redisbench_admin/run_remote/terraform.py,sha256=vV3eWXNwj7vsnFNqUgCir5ueZS4VYopEyzWiTtoSq0Q,4018
 redisbench_admin/utils/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/utils/benchmark_config.py,sha256=bC2C6rnj89wkkSlOXyyfe0N15unn_M1t1zfskfVkb98,21387
+redisbench_admin/utils/benchmark_config.py,sha256=MLszNOBS_a1LWf9uge7ugAosE6Uej5lPRMBEqndvDmI,22123
 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
@@ -235,8 +235,8 @@ redisbench_admin/utils/utils.py,sha256=XVSvo1_DdcYwk2jOxL3VPVPbnDnhGYt8ieYfANo6r
 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.43.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.43.dist-info/METADATA,sha256=UNlX9IOVDskYPuGhnpCSglVyoBBj5PZksnch-G-r5O4,5596
-redisbench_admin-0.11.43.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.43.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.43.dist-info/RECORD,,
+redisbench_admin-0.11.44.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.44.dist-info/METADATA,sha256=jpLHzNuadbzVa7qFDcFA-bHUeRf5CBGDMiqCZKolHlw,5596
+redisbench_admin-0.11.44.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.44.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.44.dist-info/RECORD,,