Using dbconfig.dataset_load_timeout_secs on run-local (#167)

* [fix] Using dbconfig.dataset_load_timeout_secs on run-local

* Bumping version from 0.3.6 to 0.3.7

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.3.6"
+version = "0.3.7"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>"]
 readme = "README.md"

redisbench_admin/environments/oss_cluster.py

@@ -20,6 +20,7 @@ def spin_up_local_redis_cluster(
     local_module_file,
     configuration_parameters=None,
     dbdir_folder=None,
+    dataset_load_timeout_secs=60,
 ):
     redis_processes = []
     meet_cmds = []
@@ -38,7 +39,7 @@ def spin_up_local_redis_cluster(
         )
         redis_process = subprocess.Popen(command)
         r = redis.StrictRedis(port=shard_port)
-        result = wait_for_conn(r)
+        result = wait_for_conn(r, dataset_load_timeout_secs)
         if result is True:
             logging.info("Redis available")
         meet_cmds.append("CLUSTER MEET {} {}".format("127.0.0.1", shard_port))

redisbench_admin/run_local/run_local.py

@@ -156,7 +156,7 @@ def run_local_command_logic(args, project_name, project_version):
                             )
                         (
                             redis_configuration_parameters,
-                            _,
+                            dataset_load_timeout_secs,
                         ) = extract_redis_dbconfig_parameters(
                             benchmark_config, "dbconfig"
                         )
@@ -172,6 +172,7 @@ def run_local_command_logic(args, project_name, project_version):
                                 local_module_file,
                                 redis_configuration_parameters,
                                 dbdir_folder,
+                                dataset_load_timeout_secs,
                             )
                             for redis_process in redis_processes:
                                 if is_process_alive(redis_process) is False:

tests/test_redisgraph_benchmark_go.py

@@ -18,6 +18,7 @@ def test_prepare_redis_graph_benchmark_go_command():
                     == "redisgraph-benchmark-go -graph-key g -rps 0 -c 32 -n 1000000 -query MATCH (n) WHERE ID(n) = 0 SET n.v = n.v + 1 -query-ratio 1 -h localhost -p 6380 -json-out-file result.txt"
                 )
 
+
 def test_prepare_redis_graph_benchmark_go_new_command():
     with open("./tests/test_data/redisgraph-benchmark-go_2.yml", "r") as yml_file:
         benchmark_config = yaml.safe_load(yml_file)