Enabled rlec related runs (using already existing env) (#371)

* Fixed execute_init_commands bug on L446

* Fixed remote results fetching from benchmark client

* Extra logging on results fetching

* Fixed is_ycsb_java check

* working on removal of unecessary dependencies

* Enabled rlec related runs (using already existing env)

Author: filipecosta90

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.9.15"
+version = "0.9.18"
 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"
@@ -36,9 +36,7 @@ daemonize = "^2.5.0"
 pandas = "^1.0"
 ansicolors = "^1.1.8"
 matplotlib = "^3.1.2"
-numpy = "^1.23.1"
 psutil = "^5.6.6"
-scipy = "^1.3.3"
 Jinja2 = "^3.0.3"
 watchdog = "^2.1.6"
 redis = "^4.2.2"

pyproject.toml

@@ -5,8 +5,6 @@
 #
 import logging
 
-import numpy as np
-
 
 def metric_safe_name(row, replace_by="_"):
     import re

redisbench_admin/export/google_benchmark/google_benchmark_json_format.py

@@ -4,7 +4,6 @@
 #  All rights reserved.
 #
 import logging
-
 import numpy as np
 
 

redisbench_admin/export/pyperf/pyperf_json_format.py

@@ -30,8 +30,10 @@
 FAIL_FAST = bool(int(os.getenv("FAIL_FAST", 0)))
 PROFILERS_DSO = os.getenv("PROFILERS_DSO", None)
 GIT_ORG = os.getenv("GIT_ORG", None)
+GIT_BRANCH = os.getenv("GIT_BRANCH", None)
 GIT_REPO = os.getenv("GIT_REPO", None)
 PROFILERS_ENABLED = bool(int(os.getenv("PROFILE", 0)))
+COMMANDSTATS_ENABLED = bool(int(os.getenv("COMMANDSTATS_ENABLED", 1)))
 PROFILERS = os.getenv("PROFILERS", PROFILERS_DEFAULT)
 MAX_PROFILERS_PER_TYPE = int(os.getenv("MAX_PROFILERS", 1))
 PROFILE_FREQ = os.getenv("PROFILE_FREQ", PROFILE_FREQ_DEFAULT)
@@ -99,7 +101,7 @@ def common_run_args(parser):
     parser.add_argument("--github_repo", type=str, default=GIT_REPO)
     parser.add_argument("--github_org", type=str, default=GIT_ORG)
     parser.add_argument("--github_sha", type=str, default=None, nargs="?", const="")
-    parser.add_argument("--github_branch", type=str, default=None, nargs="?", const="")
+    parser.add_argument("--github_branch", type=str, default=GIT_BRANCH)
     parser.add_argument("--triggering_env", type=str, default=TRIGGERING_ENV)
     parser.add_argument(
         "--module_path",
@@ -156,8 +158,8 @@ def common_run_args(parser):
     )
     parser.add_argument(
         "--collect_commandstats",
-        default=False,
-        action="store_true",
+        type=bool,
+        default=COMMANDSTATS_ENABLED,
         help="Enables commandstats collection.",
     )
     parser.add_argument(

redisbench_admin/run/ann/pkg

@@ -76,6 +76,7 @@ def prepare_benchmark_parameters(
     username=None,
     private_key=None,
     client_ssh_port=None,
+    redis_password=None,
 ):
     command_arr = None
     command_str = None
@@ -98,6 +99,7 @@ def prepare_benchmark_parameters(
                     username,
                     private_key,
                     client_ssh_port,
+                    redis_password,
                 )
     # v0.4 spec
     elif type(benchmark_config[config_key]) == dict:
@@ -117,6 +119,7 @@ def prepare_benchmark_parameters(
             username,
             private_key,
             client_ssh_port,
+            redis_password,
         )
     printed_command_str = command_str
     printed_command_arr = command_arr
@@ -146,6 +149,7 @@ def prepare_benchmark_parameters_specif_tooling(
     username,
     private_key,
     client_ssh_port,
+    redis_password=None,
 ):
     if "redis-benchmark" in benchmark_tool:
         command_arr, command_str = prepare_redis_benchmark_command(
@@ -192,6 +196,7 @@ def prepare_benchmark_parameters_specif_tooling(
             entry,
             current_workdir,
             cluster_api_enabled,
+            redis_password,
         )
 
     if "tsbs_" in benchmark_tool:
@@ -252,6 +257,7 @@ def prepare_benchmark_parameters_specif_tooling(
             input_data_file,
             isremote,
             cluster_api_enabled,
+            redis_password,
         )
     if "aibench_" in benchmark_tool:
         input_data_file = None
@@ -520,68 +526,74 @@ def run_redis_pre_steps(benchmark_config, r, required_modules):
     # In case we have modules we use it's artifact version
     # otherwise we use redis version as artifact version
     version = "N/A"
+    # run initialization commands before benchmark starts
+    logging.info("Running initialization commands before benchmark starts.")
+    execute_init_commands_start_time = datetime.datetime.now()
+    execute_init_commands(benchmark_config, r)
+    execute_init_commands_duration_seconds = (
+        datetime.datetime.now() - execute_init_commands_start_time
+    ).seconds
+    logging.info(
+        "Running initialization commands took {} secs.".format(
+            execute_init_commands_duration_seconds
+        )
+    )
+    stdout = r.execute_command("info modules")
+    (
+        module_names,
+        artifact_versions,
+    ) = extract_module_semver_from_info_modules_cmd(stdout)
+    if "search" in module_names:
+        logging.info(
+            "Detected redisearch module. Ensuring all indices are indexed prior benchmark"
+        )
+        search_specific_init(r, module_names)
     if required_modules is not None and len(required_modules) > 0:
-        stdout = r.execute_command("info modules")
-        (
-            module_names,
-            artifact_versions,
-        ) = extract_module_semver_from_info_modules_cmd(stdout)
+
         check_required_modules(module_names, required_modules)
-        # run initialization commands before benchmark starts
-        logging.info("Running initialization commands before benchmark starts.")
-        execute_init_commands_start_time = datetime.datetime.now()
-        execute_init_commands(benchmark_config, r)
-        execute_init_commands_duration_seconds = (
-            datetime.datetime.now() - execute_init_commands_start_time
-        ).seconds
+
+        version = artifact_versions[0]
+    else:
+        version = r.info("server")["redis_version"]
+
+    return version
+
+
+def search_specific_init(r, module_names):
+    if "search" in module_names:
         logging.info(
-            "Running initialization commands took {} secs.".format(
-                execute_init_commands_duration_seconds
-            )
+            "Given redisearch was detected, checking for any index that is still indexing."
         )
-        if "search" in module_names:
+        loading_indices = r.execute_command("ft._list")
+        logging.info("Detected {} indices.".format(len(loading_indices)))
+        while len(loading_indices) > 0:
             logging.info(
-                "Given redisearch was detected, checking for any index that is still indexing."
+                "There are still {} indices loading. {}".format(
+                    len(loading_indices), loading_indices
+                )
             )
-            loading_indices = r.execute_command("ft._list")
-            logging.info("Detected {} indices.".format(len(loading_indices)))
-            while len(loading_indices) > 0:
+            for index_pos, fts_indexname in enumerate(loading_indices, start=0):
+                if type(fts_indexname) == bytes:
+                    fts_indexname = fts_indexname.decode()
+                ft_info = r.execute_command("ft.info {}".format(fts_indexname))
+                is_indexing = None
+                percent_indexed = "0.0"
+                for arraypos, arrayval in enumerate(ft_info, start=0):
+                    if arrayval == b"percent_indexed" or arrayval == "percent_indexed":
+                        percent_indexed = ft_info[arraypos + 1]
+                    if arrayval == b"indexing" or arrayval == "indexing":
+                        is_indexing = ft_info[arraypos + 1]
+
                 logging.info(
-                    "There are still {} indices loading. {}".format(
-                        len(loading_indices), loading_indices
+                    "indexing={} ; percent_indexed={}.".format(
+                        is_indexing, percent_indexed
                     )
                 )
-                for index_pos, fts_indexname in enumerate(loading_indices, start=0):
-                    if type(fts_indexname) == bytes:
-                        fts_indexname = fts_indexname.decode()
-                    ft_info = r.execute_command("ft.info {}".format(fts_indexname))
-                    is_indexing = None
-                    percent_indexed = "0.0"
-                    for arraypos, arrayval in enumerate(ft_info, start=0):
-                        if (
-                            arrayval == b"percent_indexed"
-                            or arrayval == "percent_indexed"
-                        ):
-                            percent_indexed = ft_info[arraypos + 1]
-                        if arrayval == b"indexing" or arrayval == "indexing":
-                            is_indexing = ft_info[arraypos + 1]
-
-                    logging.info(
-                        "indexing={} ; percent_indexed={}.".format(
-                            is_indexing, percent_indexed
-                        )
-                    )
-                    if is_indexing == "0" or is_indexing == b"0" or is_indexing == 0:
-                        loading_indices.pop(index_pos)
+                if is_indexing == "0" or is_indexing == b"0" or is_indexing == 0:
+                    loading_indices.pop(index_pos)
 
-                time.sleep(5)
-            logging.info("Loaded all secondary indices.")
-
-        version = artifact_versions[0]
-    else:
-        version = r.info("server")["redis_version"]
-
-    return version
+            time.sleep(5)
+        logging.info("Loaded all secondary indices.")
 
 
 def dso_check(dso, local_module_file):