redis-benchmarks-specification 0.1.70__py3-none-any.whl → 0.1.73__py3-none-any.whl

redis_benchmarks_specification/__runner__/runner.py

@@ -358,7 +358,21 @@ def process_self_contained_coordinator_stream(
     preserve_temporary_client_dirs=False,
     resp_version=None,
     override_memtier_test_time=0,
+    used_memory_check_fail=False,
 ):
+    def delete_temporary_files(
+        temporary_dir_client, full_result_path, benchmark_tool_global
+    ):
+        if preserve_temporary_client_dirs is True:
+            logging.info(f"Preserving temporary client dir {temporary_dir_client}")
+        else:
+            if "redis-benchmark" in benchmark_tool_global:
+                if full_result_path is not None:
+                    os.remove(full_result_path)
+                    logging.info("Removing temporary JSON file")
+            shutil.rmtree(temporary_dir_client, ignore_errors=True)
+            logging.info(f"Removing temporary client dir {temporary_dir_client}")
+
     overall_result = True
     results_matrix = []
     total_test_suite_runs = 0
@@ -507,6 +521,11 @@ def process_self_contained_coordinator_stream(
                                 test_name, maxmemory, benchmark_required_memory
                             )
                         )
+                        delete_temporary_files(
+                            temporary_dir_client=temporary_dir_client,
+                            full_result_path=None,
+                            benchmark_tool_global=benchmark_tool_global,
+                        )
                         continue
 
                     reset_commandstats(redis_conns)
@@ -543,6 +562,11 @@ def process_self_contained_coordinator_stream(
                                         test_name, priority_upper_limit, priority
                                     )
                                 )
+                                delete_temporary_files(
+                                    temporary_dir_client=temporary_dir_client,
+                                    full_result_path=None,
+                                    benchmark_tool_global=benchmark_tool_global,
+                                )
                                 continue
                             if priority < priority_lower_limit:
                                 logging.warning(
@@ -550,6 +574,11 @@ def process_self_contained_coordinator_stream(
                                         test_name, priority_lower_limit, priority
                                     )
                                 )
+                                delete_temporary_files(
+                                    temporary_dir_client=temporary_dir_client,
+                                    full_result_path=None,
+                                    benchmark_tool_global=benchmark_tool_global,
+                                )
                                 continue
                             logging.info(
                                 "Test {} priority ({}) is within the priority limit [{},{}]".format(
@@ -559,46 +588,61 @@ def process_self_contained_coordinator_stream(
                                     priority_upper_limit,
                                 )
                             )
-
-                    if "dataset" in benchmark_config["dbconfig"]:
-                        if args.run_tests_with_dataset is False:
-                            logging.warning(
-                                "Skipping test {} giving it implies dataset preload".format(
-                                    test_name
+                    if "dbconfig" in benchmark_config:
+                        if "dataset" in benchmark_config["dbconfig"]:
+                            if args.run_tests_with_dataset is False:
+                                logging.warning(
+                                    "Skipping test {} giving it implies dataset preload".format(
+                                        test_name
+                                    )
                                 )
-                            )
-                            continue
+                                delete_temporary_files(
+                                    temporary_dir_client=temporary_dir_client,
+                                    full_result_path=None,
+                                    benchmark_tool_global=benchmark_tool_global,
+                                )
+                                continue
 
                     if dry_run is True:
                         dry_run_count = dry_run_count + 1
-                        continue
-
-                    if "preload_tool" in benchmark_config["dbconfig"]:
-                        res = data_prepopulation_step(
-                            benchmark_config,
-                            benchmark_tool_workdir,
-                            client_cpuset_cpus,
-                            docker_client,
-                            git_hash,
-                            port,
-                            temporary_dir_client,
-                            test_name,
-                            host,
-                            tls_enabled,
-                            tls_skip_verify,
-                            test_tls_cert,
-                            test_tls_key,
-                            test_tls_cacert,
-                            resp_version,
-                            args.benchmark_local_install,
-                            password,
-                            oss_cluster_api_enabled,
+                        delete_temporary_files(
+                            temporary_dir_client=temporary_dir_client,
+                            full_result_path=None,
+                            benchmark_tool_global=benchmark_tool_global,
                         )
-                        if res is False:
-                            logging.warning(
-                                "Skipping this test given preload result was false"
+                        continue
+                    if "dbconfig" in benchmark_config:
+                        if "preload_tool" in benchmark_config["dbconfig"]:
+                            res = data_prepopulation_step(
+                                benchmark_config,
+                                benchmark_tool_workdir,
+                                client_cpuset_cpus,
+                                docker_client,
+                                git_hash,
+                                port,
+                                temporary_dir_client,
+                                test_name,
+                                host,
+                                tls_enabled,
+                                tls_skip_verify,
+                                test_tls_cert,
+                                test_tls_key,
+                                test_tls_cacert,
+                                resp_version,
+                                args.benchmark_local_install,
+                                password,
+                                oss_cluster_api_enabled,
                             )
-                            continue
+                            if res is False:
+                                logging.warning(
+                                    "Skipping this test given preload result was false"
+                                )
+                                delete_temporary_files(
+                                    temporary_dir_client=temporary_dir_client,
+                                    full_result_path=None,
+                                    benchmark_tool_global=benchmark_tool_global,
+                                )
+                                continue
                     execute_init_commands(
                         benchmark_config, r, dbconfig_keyname="dbconfig"
                     )
@@ -608,6 +652,7 @@ def process_self_contained_coordinator_stream(
                         benchmark_required_memory,
                         redis_conns,
                         "start of benchmark",
+                        used_memory_check_fail,
                     )
 
                     logging.info("Checking if there is a keyspace check being enforced")
@@ -618,6 +663,11 @@ def process_self_contained_coordinator_stream(
 
                     if dry_run_include_preload is True:
                         dry_run_count = dry_run_count + 1
+                        delete_temporary_files(
+                            temporary_dir_client=temporary_dir_client,
+                            full_result_path=None,
+                            benchmark_tool_global=benchmark_tool_global,
+                        )
                         continue
 
                     benchmark_tool = extract_client_tool(benchmark_config)
@@ -692,6 +742,11 @@ def process_self_contained_coordinator_stream(
                         logging.warning(
                             "Forcing skip this test given there is an arbitrary commmand and memtier usage. Check https://github.com/RedisLabs/memtier_benchmark/pull/117 ."
                         )
+                        delete_temporary_files(
+                            temporary_dir_client=temporary_dir_client,
+                            full_result_path=None,
+                            benchmark_tool_global=benchmark_tool_global,
+                        )
                         continue
 
                     client_container_image = extract_client_container_image(
@@ -789,6 +844,7 @@ def process_self_contained_coordinator_stream(
                         benchmark_required_memory,
                         redis_conns,
                         "end of benchmark",
+                        used_memory_check_fail,
                     )
 
                     if args.flushall_on_every_test_end:
@@ -899,18 +955,11 @@ def process_self_contained_coordinator_stream(
                     shutil.copy(full_result_path, dest_fpath)
                 overall_result &= test_result
 
-                if preserve_temporary_client_dirs is True:
-                    logging.info(
-                        f"Preserving temporary client dir {temporary_dir_client}"
-                    )
-                else:
-                    if "redis-benchmark" in benchmark_tool_global:
-                        os.remove(full_result_path)
-                        logging.info("Removing temporary JSON file")
-                    shutil.rmtree(temporary_dir_client, ignore_errors=True)
-                    logging.info(
-                        f"Removing temporary client dir {temporary_dir_client}"
-                    )
+                delete_temporary_files(
+                    temporary_dir_client=temporary_dir_client,
+                    full_result_path=full_result_path,
+                    benchmark_tool_global=benchmark_tool_global,
+                )
 
     table_name = "Results for entire test-suite"
     results_matrix_headers = [
@@ -957,22 +1006,33 @@ def get_maxmemory(r):
 
 def get_benchmark_required_memory(benchmark_config):
     benchmark_required_memory = 0
-    if "resources" in benchmark_config["dbconfig"]:
-        resources = benchmark_config["dbconfig"]["resources"]
-        if "requests" in resources:
-            resources_requests = benchmark_config["dbconfig"]["resources"]["requests"]
-            if "memory" in resources_requests:
-                benchmark_required_memory = resources_requests["memory"]
-                benchmark_required_memory = int(parse_size(benchmark_required_memory))
-                logging.info(
-                    "Benchmark required memory: {} Bytes".format(
-                        benchmark_required_memory
+    if "dbconfig" in benchmark_config:
+        if "resources" in benchmark_config["dbconfig"]:
+            resources = benchmark_config["dbconfig"]["resources"]
+            if "requests" in resources:
+                resources_requests = benchmark_config["dbconfig"]["resources"][
+                    "requests"
+                ]
+                if "memory" in resources_requests:
+                    benchmark_required_memory = resources_requests["memory"]
+                    benchmark_required_memory = int(
+                        parse_size(benchmark_required_memory)
+                    )
+                    logging.info(
+                        "Benchmark required memory: {} Bytes".format(
+                            benchmark_required_memory
+                        )
                     )
-                )
     return benchmark_required_memory
 
 
-def used_memory_check(test_name, benchmark_required_memory, redis_conns, stage):
+def used_memory_check(
+    test_name,
+    benchmark_required_memory,
+    redis_conns,
+    stage,
+    used_memory_check_fail=False,
+):
     used_memory = 0
     for conn in redis_conns:
         used_memory = used_memory + conn.info("memory")["used_memory"]
@@ -984,7 +1044,8 @@ def used_memory_check(test_name, benchmark_required_memory, redis_conns, stage):
                 test_name, benchmark_required_memory, used_memory_gb
             )
         )
-        exit(1)
+        if used_memory_check_fail:
+            exit(1)
 
 
 def cp_to_workdir(benchmark_tool_workdir, srcfile):

redis_benchmarks_specification/__self_contained_coordinator__/args.py

@@ -147,4 +147,7 @@ def create_self_contained_coordinator_args(project_name):
         default="{}/defaults.yml".format(SPECS_PATH_TEST_SUITES),
         help="specify the defaults file containing spec topologies, common metric extractions,etc...",
     )
+    parser.add_argument(
+        "--arch", type=str, default="amd64", help="arch to build artifacts"
+    )
     return parser

redis_benchmarks_specification/__self_contained_coordinator__/build_info.py

@@ -7,6 +7,7 @@ from redis_benchmarks_specification.__common__.builder_schema import (
 
 
 def extract_build_info_from_streamdata(testDetails):
+    arch = "amd64"
     use_git_timestamp = False
     git_timestamp_ms = None
     metadata = None
@@ -29,6 +30,11 @@ def extract_build_info_from_streamdata(testDetails):
     build_artifacts_str = "redis-server"
     build_image = testDetails[b"build_image"].decode()
     run_image = build_image
+    if b"arch" in testDetails:
+        arch = testDetails[b"arch"].decode()
+        logging.info("detected arch info {}.".format(arch))
+    else:
+        logging.info("using default arch info {}.".format(arch))
     if b"run_image" in testDetails:
         run_image = testDetails[b"run_image"].decode()
         logging.info("detected run image info {}.".format(run_image))
@@ -49,4 +55,5 @@ def extract_build_info_from_streamdata(testDetails):
         run_image,
         use_git_timestamp,
         git_timestamp_ms,
+        arch,
     )

redis_benchmarks_specification/__self_contained_coordinator__/runners.py

@@ -136,6 +136,7 @@ def process_self_contained_coordinator_stream(
                 run_image,
                 use_git_timestamp,
                 git_timestamp_ms,
+                _,
             ) = extract_build_info_from_streamdata(testDetails)
 
             overall_result = True