redis-benchmarks-specification 0.1.277__tar.gz → 0.1.280__tar.gz

{redis_benchmarks_specification-0.1.277 → redis_benchmarks_specification-0.1.280}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redis-benchmarks-specification
-Version: 0.1.277
+Version: 0.1.280
 Summary: The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute.
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com

{redis_benchmarks_specification-0.1.277 → redis_benchmarks_specification-0.1.280}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redis-benchmarks-specification"
-version = "0.1.277"
+version = "0.1.280"
 description = "The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "Readme.md"

{redis_benchmarks_specification-0.1.277 → redis_benchmarks_specification-0.1.280}/redis_benchmarks_specification/__runner__/args.py

@@ -202,6 +202,12 @@ def create_client_runner_args(project_name):
         action="store_true",
         help="Assume benchmarking tool (e.g. memtier benchmark) is installed locally and execute it without using a docker container.",
     )
+    parser.add_argument(
+        "--memtier-bin-path",
+        type=str,
+        default="memtier_benchmark",
+        help="Path to memtier_benchmark binary when using --benchmark_local_install. Default is 'memtier_benchmark' (assumes it's in PATH).",
+    )
     parser.add_argument(
         "--override-test-runs",
         default=1,

{redis_benchmarks_specification-0.1.277 → redis_benchmarks_specification-0.1.280}/redis_benchmarks_specification/__runner__/runner.py

@@ -240,13 +240,19 @@ def run_multiple_clients(
 
             # Prepare benchmark command for this client
             if "memtier_benchmark" in client_tool:
+                # Set benchmark path based on local install option
+                if args.benchmark_local_install:
+                    full_benchmark_path = getattr(args, 'memtier_bin_path', 'memtier_benchmark')
+                else:
+                    full_benchmark_path = f"/usr/local/bin/{client_tool}"
+
                 (
                     _,
                     benchmark_command_str,
                     arbitrary_command,
                 ) = prepare_memtier_benchmark_parameters(
                     client_config,
-                    client_tool,
+                    full_benchmark_path,
                     port,
                     host,
                     password,
@@ -349,8 +355,6 @@ def run_multiple_clients(
             )
 
             # Start container (detached)
-            import os
-
             # Set working directory based on tool
             working_dir = benchmark_tool_workdir
             if "vector-db-benchmark" in client_tool:
@@ -483,8 +487,6 @@ def run_multiple_clients(
 
     if successful_results:
         # Try to read and aggregate JSON output files
-        import json
-        import os
 
         aggregated_json = {}
         memtier_json = None
@@ -1206,7 +1208,9 @@ def process_self_contained_coordinator_stream(
                     else:
                         for conn in redis_conns:
                             maxmemory = maxmemory + get_maxmemory(conn)
-                    if benchmark_required_memory > maxmemory:
+
+                    # Only perform memory check if we have valid maxmemory information
+                    if maxmemory > 0 and benchmark_required_memory > maxmemory:
                         logging.warning(
                             "Skipping test {} given maxmemory of server is bellow the benchmark required memory: {} < {}".format(
                                 test_name, maxmemory, benchmark_required_memory
@@ -1218,6 +1222,12 @@ def process_self_contained_coordinator_stream(
                             benchmark_tool_global=benchmark_tool_global,
                         )
                         continue
+                    elif maxmemory == 0 and benchmark_required_memory > 0:
+                        logging.warning(
+                            "Cannot enforce memory checks for test {} - maxmemory information unavailable. Proceeding with test.".format(
+                                test_name
+                            )
+                        )
 
                     reset_commandstats(redis_conns)
 
@@ -1341,6 +1351,7 @@ def process_self_contained_coordinator_stream(
                                 oss_cluster_api_enabled,
                                 unix_socket,
                                 buffer_timeout,
+                                args,
                             )
                             if res is False:
                                 logging.warning(
@@ -1384,7 +1395,12 @@ def process_self_contained_coordinator_stream(
                     # backwards compatible
                     if benchmark_tool is None:
                         benchmark_tool = "redis-benchmark"
-                    full_benchmark_path = f"/usr/local/bin/{benchmark_tool}"
+
+                    # Set benchmark path based on local install option
+                    if args.benchmark_local_install and "memtier_benchmark" in benchmark_tool:
+                        full_benchmark_path = getattr(args, 'memtier_bin_path', 'memtier_benchmark')
+                    else:
+                        full_benchmark_path = f"/usr/local/bin/{benchmark_tool}"
 
                     # setup the benchmark
                     (
@@ -1647,8 +1663,6 @@ def process_self_contained_coordinator_stream(
                             )
 
                             # Use explicit container management for single client
-                            import os
-
                             # Set working directory based on tool
                             working_dir = benchmark_tool_workdir
                             if "vector-db-benchmark" in benchmark_tool:
@@ -1821,7 +1835,6 @@ def process_self_contained_coordinator_stream(
                             )
                         elif "vector-db-benchmark" in benchmark_tool:
                             # For vector-db-benchmark, look for summary JSON file
-                            import os
                             summary_files = [f for f in os.listdir(temporary_dir_client) if f.endswith("-summary.json")]
                             if summary_files:
                                 full_result_path = os.path.join(temporary_dir_client, summary_files[0])
@@ -1973,9 +1986,16 @@ def process_self_contained_coordinator_stream(
 
 
 def get_maxmemory(r):
-    maxmemory = int(r.info("memory")["maxmemory"])
+    memory_info = r.info("memory")
+
+    # Check if maxmemory key exists in Redis memory info
+    if "maxmemory" not in memory_info:
+        logging.warning("maxmemory not present in Redis memory info. Cannot enforce memory checks.")
+        return 0
+
+    maxmemory = int(memory_info["maxmemory"])
     if maxmemory == 0:
-        total_system_memory = int(r.info("memory")["total_system_memory"])
+        total_system_memory = int(memory_info["total_system_memory"])
         logging.info(" Using total system memory as max {}".format(total_system_memory))
         maxmemory = total_system_memory
     else:
@@ -2275,6 +2295,7 @@ def data_prepopulation_step(
     oss_cluster_api_enabled=False,
     unix_socket="",
     timeout_buffer=60,
+    args=None,
 ):
     result = True
     # setup the benchmark
@@ -2293,7 +2314,12 @@ def data_prepopulation_step(
         benchmark_config["dbconfig"], "preload_tool"
     )
     preload_tool = extract_client_tool(benchmark_config["dbconfig"], "preload_tool")
-    full_benchmark_path = f"/usr/local/bin/{preload_tool}"
+
+    # Set preload tool path based on local install option
+    if benchmark_local_install and "memtier_benchmark" in preload_tool and args:
+        full_benchmark_path = getattr(args, 'memtier_bin_path', 'memtier_benchmark')
+    else:
+        full_benchmark_path = f"/usr/local/bin/{preload_tool}"
     client_mnt_point = "/mnt/client/"
 
     if "memtier_benchmark" in preload_tool: