Fixed memtier when DB is password protected (#372)

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.9.18"
+version = "0.9.19"
 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]>","Redis Performance Group <[email protected]>"]
 readme = "README.md"

redisbench_admin/run/args.py

@@ -38,6 +38,13 @@
 MAX_PROFILERS_PER_TYPE = int(os.getenv("MAX_PROFILERS", 1))
 PROFILE_FREQ = os.getenv("PROFILE_FREQ", PROFILE_FREQ_DEFAULT)
 KEEP_ENV = bool(os.getenv("KEEP_ENV", False))
+ALLOWED_TOOLS_DEFAULT = (
+    "memtier_benchmark,redis-benchmark,redisgraph-benchmark-go,ycsb,go-ycsb,"
+    + "tsbs_run_queries_redistimeseries,tsbs_load_redistimeseries,"
+    + "ftsb_redisearch,"
+    + "aibench_run_inference_redisai_vision,ann-benchmarks",
+)
+ALLOWED_BENCH_TOOLS = os.getenv("ALLOWED_BENCH_TOOLS", ALLOWED_TOOLS_DEFAULT)
 
 
 def common_run_args(parser):
@@ -65,10 +72,7 @@ def common_run_args(parser):
     parser.add_argument(
         "--allowed-tools",
         type=str,
-        default="memtier_benchmark,redis-benchmark,redisgraph-benchmark-go,ycsb,go-ycsb,"
-        + "tsbs_run_queries_redistimeseries,tsbs_load_redistimeseries,"
-        + "ftsb_redisearch,"
-        + "aibench_run_inference_redisai_vision,ann-benchmarks",
+        default=ALLOWED_BENCH_TOOLS,
         help="comma separated list of allowed tools for this module. By default all the supported are allowed.",
     )
     parser.add_argument(

redisbench_admin/run/common.py

@@ -223,6 +223,7 @@ def prepare_benchmark_parameters_specif_tooling(
             entry,
             cluster_api_enabled,
             remote_results_file,
+            redis_password,
         )
     if "ann" in benchmark_tool:
         ann_path = ANN_MULTIRUN_PATH

redisbench_admin/run/memtier_benchmark/memtier_benchmark.py

@@ -18,12 +18,14 @@ def prepare_memtier_benchmark_command(
     benchmark_config: object,
     cluster_api_enabled: bool,
     result_file: str,
+    redis_pass=None,
 ):
     command_arr = [executable_path]
     command_arr.extend(["-s", "{}".format(server_private_ip)])
     command_arr.extend(["-p", "{}".format(server_plaintext_port)])
     command_arr.extend(["--hide-histogram"])
-
+    if redis_pass is not None:
+        command_arr.extend(["-a", "{}".format(redis_pass)])
     if cluster_api_enabled:
         command_arr.extend(["--cluster-mode"])
     if "parameters" in benchmark_config: