feat: support multi-architecture Redis service

Author: dancing-ui

core/llm_token_ratelimit/redis_client.go

@@ -25,7 +25,7 @@ import (
 
 type SafeRedisClient struct {
 	mu     sync.RWMutex
-	client *redis.ClusterClient
+	client redis.UniversalClient
 }
 
 var globalRedisClient = NewGlobalRedisClient()
@@ -34,7 +34,7 @@ func NewGlobalRedisClient() *SafeRedisClient {
 	return &SafeRedisClient{}
 }
 
-func (c *SafeRedisClient) SetRedisClient(client *redis.ClusterClient) error {
+func (c *SafeRedisClient) SetRedisClient(client redis.UniversalClient) error {
 	if c == nil {
 		return fmt.Errorf("safe redis client is nil")
 	}
@@ -82,8 +82,8 @@ func (c *SafeRedisClient) Init(cfg *Redis) error {
 	minIdleConns := cfg.MinIdleConns
 	maxRetries := cfg.MaxRetries
 
-	newClient := redis.NewClusterClient(
-		&redis.ClusterOptions{
+	newClient := redis.NewUniversalClient(
+		&redis.UniversalOptions{
 			Addrs: addrs,
 
 			Username: cfg.Username,
@@ -100,10 +100,6 @@ func (c *SafeRedisClient) Init(cfg *Redis) error {
 		},
 	)
 
-	if newClient == nil {
-		return fmt.Errorf("new redis client is nil")
-	}
-
 	if _, err := newClient.Ping(context.TODO()).Result(); err != nil {
 		return fmt.Errorf("failed to connect to redis cluster: %v", err)
 	}

tests/benchmark/llm_token_ratelimit/build-container.sh

@@ -1,31 +1,48 @@
 #!/bin/zsh
 
+supported_modes=("single" "cluster")
+
+mode=$1
+if [[ ! " ${supported_modes[@]} " =~ " ${mode} " ]]; then
+    echo "Usage: $0 [single|cluster]"
+    exit 1
+fi
+
+if [[ ! -e "docker-compose-$mode.yml" ]]; then
+    echo "docker-compose-$mode.yml not found!"
+    exit 1
+fi
+
 echo "Building application..."
 ./build-code.sh
 
 echo "Building and starting containers..."
-docker-compose -f docker-compose.yml down
-docker-compose -f docker-compose.yml up --build -d
+docker-compose -f docker-compose-$mode.yml down
+docker-compose -f docker-compose-$mode.yml up --build -d
 
 echo "Waiting for Redis nodes to start..."
 sleep 10
 
-echo "Checking Redis nodes status..."
-for port in 7001 7002 7003; do
-    echo "Checking Redis on port $port..."
-    timeout 5 redis-cli -h 127.0.0.1 -p $port ping || echo "Redis on port $port not ready"
-done
-
-echo "Initializing Redis cluster..."
-# 使用容器内部执行集群初始化
-docker exec redis-node-1 redis-cli --cluster create \
-    172.20.0.11:6379 \
-    172.20.0.12:6379 \
-    172.20.0.13:6379 \
-    --cluster-replicas 0 \
-    --cluster-yes
-
-echo "Checking cluster status..."
-docker exec redis-node-1 redis-cli cluster nodes
-
-echo "Cluster setup complete!"
+if [ "$mode" = "cluster" ]; then
+    echo "Checking Redis nodes status..."
+    for port in 7001 7002 7003; do
+        echo "Checking Redis on port $port..."
+        timeout 5 redis-cli -h 127.0.0.1 -p $port ping || echo "Redis on port $port not ready"
+    done
+
+    echo "Initializing Redis cluster..."
+    # 使用容器内部执行集群初始化
+    docker exec redis-node-1 redis-cli --cluster create \
+        172.20.0.11:6379 \
+        172.20.0.12:6379 \
+        172.20.0.13:6379 \
+        --cluster-replicas 0 \
+        --cluster-yes
+
+    echo "Checking cluster status..."
+    docker exec redis-node-1 redis-cli cluster nodes
+else
+    echo "Single node mode, no cluster initialization needed."
+fi
+
+echo "Containers setup complete!"

tests/benchmark/llm_token_ratelimit/docker-compose.yml renamed to tests/benchmark/llm_token_ratelimit/docker-compose-cluster.yml

@@ -1,13 +1,13 @@
 services:
-  # Redis 6.0 集群（三主三从）
+  # Redis 6.0 集群
   redis-node-1:
     image: redis:6.2.7
     container_name: redis-node-1
     ports:
       - "7001:6379"
       - "17001:16379"
     volumes:
-      - ./redis.conf:/usr/local/etc/redis/redis.conf
+      - ./redis-cluster.conf:/usr/local/etc/redis/redis.conf
     command: redis-server /usr/local/etc/redis/redis.conf
     networks:
       test-network:
@@ -20,7 +20,7 @@ services:
       - "7002:6379"
       - "17002:16379"
     volumes:
-      - ./redis.conf:/usr/local/etc/redis/redis.conf
+      - ./redis-cluster.conf:/usr/local/etc/redis/redis.conf
     command: redis-server /usr/local/etc/redis/redis.conf
     networks:
       test-network:
@@ -33,7 +33,7 @@ services:
       - "7003:6379"
       - "17003:16379"
     volumes:
-      - ./redis.conf:/usr/local/etc/redis/redis.conf
+      - ./redis-cluster.conf:/usr/local/etc/redis/redis.conf
     command: redis-server /usr/local/etc/redis/redis.conf
     networks:
       test-network:

tests/benchmark/llm_token_ratelimit/docker-compose-single.yml

@@ -0,0 +1,43 @@
+services:
+  # Redis 6.0 单节点
+  redis-node-1:
+    image: redis:6.2.7
+    container_name: redis-node-1
+    ports:
+      - "7001:6379"
+    volumes:
+      - ./redis-single.conf:/usr/local/etc/redis/redis.conf
+    command: redis-server /usr/local/etc/redis/redis.conf
+    networks:
+      - test-network
+
+  # Sentinel Go LLM Token RateLimit 服务容器
+  sentinel-go-llm-token-ratelimit:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: sentinel-go-llm-token-ratelimit
+    command: ["tail", "-f", "/dev/null"]
+    ports:
+      - "9527:9527"
+    volumes:
+      - ./out:/workspace
+    networks:
+      - test-network
+    depends_on:
+      - redis-node-1
+    environment:
+      - LLM_API_KEY=${LLM_API_KEY}
+      - LLM_BASE_URL=${LLM_BASE_URL}
+      - LLM_MODEL=${LLM_MODEL}
+    deploy:
+      resources:
+        limits:
+          cpus: '2'
+          memory: 4G
+    restart: on-failure
+
+# 定义网络和卷
+networks:
+  test-network:
+    driver: bridge

tests/benchmark/llm_token_ratelimit/redis.conf renamed to tests/benchmark/llm_token_ratelimit/redis-cluster.conf

@@ -0,0 +1,6 @@
+port 6379
+bind 0.0.0.0
+protected-mode no
+daemonize no
+appendonly yes
+cluster-enabled no