redis-benchmarks-specification 0.1.102__py3-none-any.whl → 0.1.150__py3-none-any.whl

redis_benchmarks_specification/__runner__/runner.py

@@ -211,7 +211,7 @@ def prepare_memtier_benchmark_parameters(
     server,
     password,
     local_benchmark_output_filename,
-    oss_cluster_api_enabled,
+    oss_cluster_api_enabled=False,
     tls_enabled=False,
     tls_skip_verify=False,
     tls_cert=None,
@@ -255,6 +255,7 @@ def prepare_memtier_benchmark_parameters(
 
     if oss_cluster_api_enabled is True:
         benchmark_command.append("--cluster-mode")
+    logging.info(f"Preparing the benchmark parameters. {benchmark_command}.")
     benchmark_command_str = " ".join(benchmark_command)
     if "arguments" in clientconfig:
         benchmark_command_str = benchmark_command_str + " " + clientconfig["arguments"]
@@ -382,6 +383,7 @@ def process_self_contained_coordinator_stream(
     defaults_filename = args.defaults_filename
     override_test_runs = args.override_test_runs
     (
+        _,
         _,
         default_metrics,
         _,
@@ -396,7 +398,7 @@ def process_self_contained_coordinator_stream(
 
         with open(test_file, "r") as stream:
             _, benchmark_config, test_name = get_final_benchmark_config(
-                None, stream, ""
+                None, None, stream, ""
             )
 
             if tls_enabled:
@@ -410,6 +412,7 @@ def process_self_contained_coordinator_stream(
             for topology_spec_name in benchmark_config["redis-topologies"]:
                 test_result = False
                 benchmark_tool_global = ""
+                full_result_path = None
                 try:
                     current_cpu_pos = args.cpuset_start_pos
                     temporary_dir_client = tempfile.mkdtemp(dir=home)
@@ -756,7 +759,10 @@ def process_self_contained_coordinator_stream(
                     profiler_frequency = 99
 
                     # start the profile
-                    (profiler_name, profilers_map,) = profilers_start_if_required(
+                    (
+                        profiler_name,
+                        profilers_map,
+                    ) = profilers_start_if_required(
                         profilers_enabled,
                         profilers_list,
                         redis_pids,
@@ -821,7 +827,10 @@ def process_self_contained_coordinator_stream(
                             benchmark_end_time, benchmark_start_time
                         )
                     )
-                    (_, overall_tabular_data_map,) = profilers_stop_if_required(
+                    (
+                        _,
+                        overall_tabular_data_map,
+                    ) = profilers_stop_if_required(
                         datasink_push_results_redistimeseries,
                         benchmark_duration_seconds,
                         collection_summary_str,
@@ -1067,7 +1076,10 @@ def print_results_table_stdout(
     cpu_usage=None,
 ):
     # check which metrics to extract
-    (_, metrics,) = merge_default_and_config_metrics(
+    (
+        _,
+        metrics,
+    ) = merge_default_and_config_metrics(
         benchmark_config,
         default_metrics,
         None,
@@ -1092,7 +1104,10 @@ def prepare_overall_total_test_results(
     benchmark_config, default_metrics, results_dict, test_name, overall_results_matrix
 ):
     # check which metrics to extract
-    (_, metrics,) = merge_default_and_config_metrics(
+    (
+        _,
+        metrics,
+    ) = merge_default_and_config_metrics(
         benchmark_config,
         default_metrics,
         None,

redis_benchmarks_specification/__self_contained_coordinator__/args.py

@@ -1,5 +1,4 @@
 import argparse
-import datetime
 import os
 from redis_benchmarks_specification.__common__.env import (
     MACHINE_CPU_COUNT,
@@ -20,10 +19,6 @@ from redis_benchmarks_specification.__common__.env import (
     PROFILERS_DEFAULT,
     ALLOWED_PROFILERS,
 )
-from redis_benchmarks_specification.__compare__.args import (
-    START_TIME_NOW_UTC,
-    START_TIME_LAST_SIX_MONTHS_UTC,
-)
 
 PERFORMANCE_GH_TOKEN = os.getenv("PERFORMANCE_GH_TOKEN", None)
 

redis_benchmarks_specification/__self_contained_coordinator__/artifacts.py

@@ -6,19 +6,22 @@ def restore_build_artifacts_from_test_details(
     build_artifacts, conn, temporary_dir, testDetails
 ):
     for build_artifact in build_artifacts:
-        buffer_key = testDetails["{}".format(build_artifact).encode()]
-        logging.info(
-            "Reading artifact binary {} from key {}".format(build_artifact, buffer_key)
-        )
-        buffer = bytes(conn.get(buffer_key))
-        artifact_fname = "{}/{}".format(temporary_dir, build_artifact)
-        with open(artifact_fname, "wb") as fd:
-            fd.write(buffer)
-            os.chmod(artifact_fname, 755)
-        # TODO: re-enable
-        # if build_artifact == "redis-server":
-        #     redis_server_path = artifact_fname
+        build_artifact_key = "{}".format(build_artifact).encode()
+        if build_artifact_key in testDetails:
+            buffer_key = testDetails[build_artifact_key]
+            logging.info(
+                "Reading artifact binary {} from key {}".format(
+                    build_artifact, buffer_key
+                )
+            )
+            buffer = bytes(conn.get(buffer_key))
+            artifact_fname = "{}/{}".format(temporary_dir, build_artifact)
+            with open(artifact_fname, "wb") as fd:
+                fd.write(buffer)
+                os.chmod(artifact_fname, 755)
 
-        logging.info(
-            "Successfully restored {} into {}".format(build_artifact, artifact_fname)
-        )
+            logging.info(
+                "Successfully restored {} into {}".format(
+                    build_artifact, artifact_fname
+                )
+            )

redis_benchmarks_specification/__self_contained_coordinator__/build_info.py

@@ -10,11 +10,13 @@ def extract_build_info_from_streamdata(testDetails):
     arch = "amd64"
     use_git_timestamp = False
     git_timestamp_ms = None
-    metadata = None
+    metadata = {}
     build_variant_name = None
     fields = [fieldname.decode() for fieldname in testDetails.keys()]
-    logging.info("Fields on stream {}".format(fields))
-    git_hash = testDetails[b"git_hash"]
+    logging.info("Fields on stream {}".format(testDetails))
+    git_hash = None
+    if b"git_hash" in testDetails:
+        git_hash = testDetails[b"git_hash"].decode()
     if b"use_git_timestamp" in testDetails:
         use_git_timestamp = bool(testDetails[b"use_git_timestamp"].decode())
     if b"git_timestamp_ms" in testDetails:

redis_benchmarks_specification/__self_contained_coordinator__/docker.py

@@ -8,7 +8,7 @@ from redis_benchmarks_specification.__self_contained_coordinator__.cpuset import
 
 
 def generate_standalone_redis_server_args(
-    binary, port, dbdir, configuration_parameters=None
+    binary, port, dbdir, configuration_parameters=None, redis_arguments=""
 ):
     added_params = ["port", "protected-mode", "dir"]
     # start redis-server
@@ -18,9 +18,9 @@ def generate_standalone_redis_server_args(
         "no",
         "--port",
         "{}".format(port),
-        "--dir",
-        dbdir,
     ]
+    if dbdir != "":
+        command.extend(["--dir", dbdir])
     if configuration_parameters is not None:
         for parameter, parameter_value in configuration_parameters.items():
             if parameter not in added_params:
@@ -30,6 +30,10 @@ def generate_standalone_redis_server_args(
                         parameter_value,
                     ]
                 )
+    if redis_arguments != "":
+        redis_arguments_arr = redis_arguments.split(" ")
+        logging.info(f"adding redis arguments {redis_arguments_arr}")
+        command.extend(redis_arguments_arr)
     return command
 
 

redis_benchmarks_specification/__self_contained_coordinator__/prepopulation.py

@@ -43,7 +43,10 @@ def data_prepopulation_step(
     full_benchmark_path = "/usr/local/bin/{}".format(preload_tool)
     client_mnt_point = "/mnt/client/"
     if "memtier_benchmark" in preload_tool:
-        (_, preload_command_str,) = prepare_memtier_benchmark_parameters(
+        (
+            _,
+            preload_command_str,
+        ) = prepare_memtier_benchmark_parameters(
             benchmark_config["dbconfig"]["preload_tool"],
             full_benchmark_path,
             port,

redis_benchmarks_specification/__self_contained_coordinator__/runners.py

@@ -32,7 +32,6 @@ from redisbench_admin.run.redistimeseries import (
 from redisbench_admin.run.run import calculate_client_tool_duration_and_check
 from redisbench_admin.utils.benchmark_config import (
     get_final_benchmark_config,
-    extract_redis_dbconfig_parameters,
 )
 from redisbench_admin.utils.local import get_local_run_full_filename
 from redisbench_admin.utils.results import post_process_benchmark_results
@@ -47,6 +46,7 @@ from redis_benchmarks_specification.__common__.spec import (
     extract_client_cpu_limit,
     extract_client_tool,
     extract_client_container_image,
+    extract_redis_dbconfig_parameters,
 )
 from redis_benchmarks_specification.__self_contained_coordinator__.artifacts import (
     restore_build_artifacts_from_test_details,
@@ -120,6 +120,7 @@ def process_self_contained_coordinator_stream(
     stream_id = "n/a"
     overall_result = False
     total_test_suite_runs = 0
+    full_result_path = None
     try:
         stream_id, testDetails = newTestInfo[0][1][0]
         stream_id = stream_id.decode()
@@ -163,7 +164,7 @@ def process_self_contained_coordinator_stream(
 
                 with open(test_file, "r") as stream:
                     result, benchmark_config, test_name = get_final_benchmark_config(
-                        None, stream, ""
+                        None, None, stream, ""
                     )
                     if result is False:
                         logging.error(
@@ -456,7 +457,10 @@ def process_self_contained_coordinator_stream(
                                 )
                             r.shutdown(save=False)
 
-                            (_, overall_tabular_data_map,) = profilers_stop_if_required(
+                            (
+                                _,
+                                overall_tabular_data_map,
+                            ) = profilers_stop_if_required(
                                 datasink_push_results_redistimeseries,
                                 benchmark_duration_seconds,
                                 collection_summary_str,