redisbench-admin 0.11.73__tar.gz → 0.11.74__tar.gz

{redisbench_admin-0.11.73 → redisbench_admin-0.11.74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redisbench-admin
-Version: 0.11.73
+Version: 0.11.74
 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.73 → redisbench_admin-0.11.74}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.73"
+version = "0.11.74"
 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.73 → redisbench_admin-0.11.74}/redisbench_admin/run_local/local_db.py

@@ -4,6 +4,7 @@
 #  All rights reserved.
 #
 import logging
+import os
 import tempfile
 import datetime
 
@@ -32,6 +33,7 @@ from redisbench_admin.utils.local import (
     check_dataset_local_requirements,
     is_process_alive,
 )
+from redisbench_admin.utils.utils import setup_search_clusterset
 
 
 def local_db_spin(
@@ -163,6 +165,9 @@ def local_db_spin(
         r.client_setname("redisbench-admin-standalone")
         redis_conns.append(r)
 
+    # Setup search CLUSTERSET if enabled (after all servers are started and cluster is set up)
+    setup_search_clusterset(redis_conns, args.host, args.port, args.password)
+
     if dataset is None:
         if flushall_on_every_test_start:
             logging.info("Will flush all data at test start...")
@@ -213,8 +218,13 @@ def local_db_spin(
         )
     dbconfig_keyspacelen_check(benchmark_config, redis_conns, ignore_keyspace_errors)
 
-    artifact_version = run_redis_pre_steps(
-        benchmark_config, redis_conns[0], required_modules
-    )
+    if 'SEARCH_CLUSTERSET' in os.environ:
+        logging.info("SEARCH_CLUSTERSET is set. Running run_redis_pre_steps for each shard")
+        for conn in redis_conns:
+            artifact_version = run_redis_pre_steps(benchmark_config, conn, required_modules)
+    else:
+        artifact_version = run_redis_pre_steps(
+            benchmark_config, redis_conns[0], required_modules
+        )
 
     return result, artifact_version, cluster_api_enabled, redis_conns, redis_processes

{redisbench_admin-0.11.73 → redisbench_admin-0.11.74}/redisbench_admin/run_remote/remote_db.py

@@ -5,7 +5,7 @@
 #
 import datetime
 import logging
-
+import os
 import redis
 
 from redisbench_admin.environments.oss_cluster import setup_redis_cluster_from_conns
@@ -37,6 +37,7 @@ from redisbench_admin.utils.remote import (
     check_dataset_remote_requirements,
     get_run_full_filename,
 )
+from redisbench_admin.utils.utils import setup_search_clusterset
 
 
 def remote_tmpdir_prune(
@@ -277,6 +278,14 @@ def remote_db_spin(
         )
         server_plaintext_port = cluster_start_port
 
+    # Setup BigRedis CLUSTERSET if enabled (after all servers are started and cluster is set up)
+    setup_search_clusterset(
+        redis_conns,
+        server_private_ip,
+        cluster_start_port if cluster_enabled else server_plaintext_port,
+        redis_password,
+    )
+
     topology_setup_end_time = datetime.datetime.now()
     topology_setup_duration_seconds = (
         topology_setup_end_time - topology_setup_start_time
@@ -406,9 +415,12 @@ def remote_db_spin(
         ignore_keyspace_errors,
         keyspace_check_timeout,
     )
-    artifact_version = run_redis_pre_steps(
-        benchmark_config, redis_conns[0], required_modules
-    )
+    if 'SEARCH_CLUSTERSET' in os.environ:
+        logging.info("SEARCH_CLUSTERSET is set. Running run_redis_pre_steps for each shard")
+        for conn in redis_conns:
+            artifact_version = run_redis_pre_steps(benchmark_config, conn, required_modules)
+    else:
+        artifact_version = run_redis_pre_steps(benchmark_config, redis_conns[0], required_modules)
     return (
         artifact_version,
         cluster_enabled,

{redisbench_admin-0.11.73 → redisbench_admin-0.11.74}/redisbench_admin/run_remote/standalone.py

@@ -583,6 +583,17 @@ def generate_remote_standalone_redis_cmd(
                 )
     if remote_module_files is not None:
         initial_redis_cmd += " " + " ".join(command)
+
+    # Add BigRedis configuration if enabled via environment variable
+    if os.getenv("BIGREDIS_ENABLED") is not None:
+        bigredis_path = os.getenv("BIGREDIS_PATH", f"{temporary_dir}/redis.big")
+        bigredis_use_async = os.getenv("BIGREDIS_USE_ASYNC", "no")
+        logging.info(f"BigRedis enabled. Using bigredis-path: {bigredis_path}")
+        initial_redis_cmd += " --bigredis-enabled yes"
+        initial_redis_cmd += " --bigredis-driver speedb"
+        initial_redis_cmd += f" --bigredis-use-async {bigredis_use_async}"
+        initial_redis_cmd += f" --bigredis-path {bigredis_path}"
+
     return full_logfile, initial_redis_cmd
 
 

{redisbench_admin-0.11.73 → redisbench_admin-0.11.74}/redisbench_admin/utils/utils.py

@@ -137,6 +137,75 @@ def generate_common_server_args(
     return command
 
 
+def setup_search_clusterset(redis_conns, host="127.0.0.1", start_port=6379, password=None):
+    """
+    Configure  SEARCH.CLUSTERSET for Redis instances.
+    This is required when SEARCH_CLUSTERSET is set to configure the search module
+    to work with BigRedis. Supports both standalone (single conn) and cluster (multiple conns).
+
+    Args:
+        redis_conns: List of Redis connection objects (or single connection)
+        host: Redis host address (default: 127.0.0.1)
+        start_port: Starting port number (default: 6379)
+        password: Redis password (optional)
+    """
+    if os.getenv("SEARCH_CLUSTERSET") is None:
+        return
+
+    # Handle single connection case
+    if not isinstance(redis_conns, list):
+        redis_conns = [redis_conns]
+
+    shard_count = len(redis_conns)
+    logging.info(f"Search Clusterset enabled - configuring SEARCH.CLUSTERSET for {shard_count} shard(s)")
+
+    # Calculate slots per shard
+    total_slots = 16384
+    slots_per_shard = total_slots // shard_count
+
+    for shard_id, conn in enumerate(redis_conns, start=1):
+        port = start_port + shard_id - 1
+
+        # Calculate slot range for this shard
+        slot_start = (shard_id - 1) * slots_per_shard
+        if shard_id == shard_count:
+            # Last shard gets remaining slots
+            slot_end = total_slots - 1
+        else:
+            slot_end = shard_id * slots_per_shard - 1
+
+        # Build the address string with optional password
+        if password:
+            addr = f"{password}@{host}:{port}"
+        else:
+            addr = f"{host}:{port}"
+
+        logging.info(
+            f"Sending SEARCH.CLUSTERSET to shard {shard_id}: "
+            f"slots {slot_start}-{slot_end}, addr {host}:{port}"
+        )
+
+        try:
+            conn.execute_command(
+                "SEARCH.CLUSTERSET",
+                "MYID",
+                str(shard_id),
+                "RANGES",
+                "1",
+                "SHARD",
+                str(shard_id),
+                "SLOTRANGE",
+                str(slot_start),
+                str(slot_end),
+                "ADDR",
+                addr,
+                "MASTER",
+            )
+            logging.info(f"SEARCH.CLUSTERSET command executed successfully for shard {shard_id}")
+        except Exception as e:
+            logging.warning(f"Failed to execute SEARCH.CLUSTERSET for shard {shard_id}: {e}")
+
+
 def upload_artifacts_to_s3(
     artifacts,
     s3_bucket_name,