redisbench-admin 0.11.61__tar.gz → 0.11.63__tar.gz

{redisbench_admin-0.11.61 → redisbench_admin-0.11.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redisbench-admin
-Version: 0.11.61
+Version: 0.11.63
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 License-File: LICENSE
 Author: filipecosta90

{redisbench_admin-0.11.61 → redisbench_admin-0.11.63}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.61"
+version = "0.11.63"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "README.md"

{redisbench_admin-0.11.61 → redisbench_admin-0.11.63}/redisbench_admin/run_remote/run_remote.py

@@ -404,8 +404,10 @@ def run_remote_command_logic(args, project_name, project_version):
     ts_key_spot_price = f"ts:{tf_triggering_env}:tests:spot_price"
     ts_key_full_price = f"ts:{tf_triggering_env}:tests:full_price"
     ts_key_architecture = f"ts:{tf_triggering_env}:tests:arch:{architecture}"
-
+    reused_mixed = False
     for benchmark_type, bench_by_dataset_map in ensure_mixed_types_first(benchmark_runs_plan):
+        if benchmark_type == "mixed" and "read-only" in benchmark_runs_plan:
+            reuse_mixed = True
         if return_code != 0 and args.fail_fast:
             logging.warning(
                 "Given you've selected fail fast skipping benchmark_type {}".format(
@@ -658,7 +660,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                             ld_library_paths,
                                             extra_libs,
                                         )
-                                        if benchmark_type == "read-only":
+                                        if benchmark_type == "read-only" or reused_mixed:
                                             ro_benchmark_set(
                                                 artifact_version,
                                                 cluster_enabled,

{redisbench_admin-0.11.61 → redisbench_admin-0.11.63}/redisbench_admin/utils/remote.py

@@ -169,9 +169,12 @@ def execute_remote_commands(
                   )
               )
             else:
+              # Take first 10 lines, truncate each to 200 chars to avoid huge logs
+              stdout_limited = [line[:100] for line in stdout[:10]]
+              stderr_limited = [line[:100] for line in stderr[:10]]
               logging.info(
                   "Exit status: {} for command {}.\n\tSTDERR: {}\n\tSTDOUT: {}".format(
-                      recv_exit_status, command, stdout[0:100], stderr[0:100]
+                      recv_exit_status, command, stderr_limited, stdout_limited
                   )
               )
         res.append([recv_exit_status, stdout, stderr])