improved generate_standalone_redis_server_args (#159)

* [add] improved generate_standalone_redis_server_args

Author: filipecosta90

.gitignore

@@ -9,6 +9,7 @@ datasets
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
+utilities/redis_benchmarks_specification/__pycache__/
 *.py[cod]
 *$py.class
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.3.1"
+version = "0.3.2"
 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_standalone.py

@@ -13,10 +13,15 @@
 
 
 def spin_up_local_redis(
-    dbdir, port, local_module_files, configuration_parameters=None, dbdir_folder=None
+    binary,
+    port,
+    dbdir,
+    local_module_files,
+    configuration_parameters=None,
+    dbdir_folder=None,
 ):
     command = generate_standalone_redis_server_args(
-        dbdir, local_module_files, port, configuration_parameters
+        binary, dbdir, local_module_files, port, configuration_parameters
     )
 
     logging.info(
@@ -32,11 +37,11 @@ def spin_up_local_redis(
 
 
 def generate_standalone_redis_server_args(
-    dbdir, local_module_files, port, configuration_parameters=None
+    binary, dbdir, local_module_files, port, configuration_parameters=None
 ):
     # start redis-server
     command = [
-        "redis-server",
+        binary,
         "--save",
         '""',
         "--port",

redisbench_admin/run_local/run_local.py

@@ -198,8 +198,9 @@ def run_local_command_logic(args, project_name, project_version):
 
                         if setup_type == "oss-standalone":
                             redis_processes = spin_up_local_redis(
-                                temporary_dir,
+                                "redis-server",
                                 args.port,
+                                temporary_dir,
                                 local_module_file,
                                 redis_configuration_parameters,
                                 dbdir_folder,

redisbench_admin/utils/utils.py

@@ -236,7 +236,7 @@ def get_ts_metric_name(
     return ts_name
 
 
-def wait_for_conn(conn, retries=120, command="PING", should_be=True):
+def wait_for_conn(conn, retries=20, command="PING", should_be=True):
     """Wait until a given Redis connection is ready"""
     result = False
     while retries > 0 and result is False:

tests/test_local.py

@@ -50,10 +50,12 @@
 
 
 def test_generate_standalone_redis_server_args():
-    cmd = generate_standalone_redis_server_args(".", None, "9999")
+    cmd = generate_standalone_redis_server_args("redis-server", ".", None, "9999")
     assert cmd == ["redis-server", "--save", '""', "--port", "9999", "--dir", "."]
     local_module_file = "m1.so"
-    cmd = generate_standalone_redis_server_args(".", local_module_file, "1010")
+    cmd = generate_standalone_redis_server_args(
+        "redis-server", ".", local_module_file, "1010"
+    )
     assert cmd == [
         "redis-server",
         "--save",
@@ -66,7 +68,7 @@ def test_generate_standalone_redis_server_args():
         os.path.abspath(local_module_file),
     ]
     cmd = generate_standalone_redis_server_args(
-        ".", None, "9999", {"notify-keyspace-events": "KEA"}
+        "redis-server", ".", None, "9999", {"notify-keyspace-events": "KEA"}
     )
     assert cmd == [
         "redis-server",
@@ -84,6 +86,6 @@ def test_generate_standalone_redis_server_args():
 def test_spin_up_local_redis():
     if shutil.which("redis-server"):
         port = 9999
-        spin_up_local_redis(".", port, None)
+        spin_up_local_redis("redis-server", port, ".", None)
         r = redis.Redis(host="localhost", port=port)
         assert r.ping() == True