From b964e00e1ddad0557714f191c5168e8e7dd84ea4 Mon Sep 17 00:00:00 2001 From: Taishi Kasuga Date: Sun, 21 Dec 2025 13:02:59 +0900 Subject: [PATCH 1/2] ci: use valkey for scaling test --- .github/workflows/test.yaml | 10 +++++----- compose.scale.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a8c85f7..2543de0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -45,11 +45,11 @@ jobs: - {ruby: 'truffleruby'} - {task: test_cluster_down} - {task: test_cluster_broken, restart: 'no', startup: '6'} - - {task: test_cluster_state, pattern: 'PrimaryOnly', compose: compose.valkey.yaml, redis: '8', replica: '2', startup: '9'} - - {task: test_cluster_state, pattern: 'Pooled', compose: compose.valkey.yaml, redis: '8', replica: '2', startup: '9'} - - {task: test_cluster_state, pattern: 'ScaleReadRandom', compose: compose.valkey.yaml, redis: '8', replica: '2', startup: '9'} - - {task: test_cluster_state, pattern: 'ScaleReadRandomWithPrimary', compose: compose.valkey.yaml, redis: '8', replica: '2', startup: '9'} - - {task: test_cluster_state, pattern: 'ScaleReadLatency', compose: compose.valkey.yaml, redis: '8', replica: '2', startup: '9'} + - {task: test_cluster_state, pattern: 'PrimaryOnly', compose: compose.valkey.yaml, redis: '9', replica: '2', startup: '9'} + - {task: test_cluster_state, pattern: 'Pooled', compose: compose.valkey.yaml, redis: '9', replica: '2', startup: '9'} + - {task: test_cluster_state, pattern: 'ScaleReadRandom', compose: compose.valkey.yaml, redis: '9', replica: '2', startup: '9'} + - {task: test_cluster_state, pattern: 'ScaleReadRandomWithPrimary', compose: compose.valkey.yaml, redis: '9', replica: '2', startup: '9'} + - {task: test_cluster_state, pattern: 'ScaleReadLatency', compose: compose.valkey.yaml, redis: '9', replica: '2', startup: '9'} - {task: test_cluster_scale, pattern: 'Single', compose: compose.scale.yaml, startup: '8'} - {task: test_cluster_scale, pattern: 'Pipeline', compose: compose.scale.yaml, startup: '8'} - {task: test_cluster_scale, pattern: 'Transaction', compose: compose.scale.yaml, startup: '8'} diff --git a/compose.scale.yaml b/compose.scale.yaml index 5565ed7..21f8371 100644 --- a/compose.scale.yaml +++ b/compose.scale.yaml @@ -1,9 +1,9 @@ --- services: node1: &node - image: "redis:${REDIS_VERSION:-8}" + image: "valkey/valkey:${REDIS_VERSION:-9}" command: > - redis-server + valkey-server --maxmemory 64mb --maxmemory-policy allkeys-lru --appendonly yes @@ -12,7 +12,7 @@ services: --cluster-node-timeout 5000 restart: "${RESTART_POLICY:-always}" healthcheck: - test: ["CMD", "redis-cli", "ping"] + test: ["CMD", "valkey-cli", "ping"] interval: "7s" timeout: "5s" retries: 10 @@ -47,12 +47,12 @@ services: ports: - "6386:6379" clustering: - image: "redis:${REDIS_VERSION:-8}" + image: "valkey/valkey:${REDIS_VERSION:-9}" command: > bash -c "apt-get update > /dev/null && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null && rm -rf /var/lib/apt/lists/* - && yes yes | redis-cli --cluster create + && yes yes | valkey-cli --cluster create $$(dig node1 +short):6379 $$(dig node2 +short):6379 $$(dig node3 +short):6379 From c149b5d58e0ce8be1842f1a1bfb49b469700cdb4 Mon Sep 17 00:00:00 2001 From: Taishi Kasuga Date: Sun, 21 Dec 2025 17:47:40 +0900 Subject: [PATCH 2/2] fix --- compose.scale.yaml | 10 +++++----- test/test_against_cluster_scale.rb | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compose.scale.yaml b/compose.scale.yaml index 21f8371..5565ed7 100644 --- a/compose.scale.yaml +++ b/compose.scale.yaml @@ -1,9 +1,9 @@ --- services: node1: &node - image: "valkey/valkey:${REDIS_VERSION:-9}" + image: "redis:${REDIS_VERSION:-8}" command: > - valkey-server + redis-server --maxmemory 64mb --maxmemory-policy allkeys-lru --appendonly yes @@ -12,7 +12,7 @@ services: --cluster-node-timeout 5000 restart: "${RESTART_POLICY:-always}" healthcheck: - test: ["CMD", "valkey-cli", "ping"] + test: ["CMD", "redis-cli", "ping"] interval: "7s" timeout: "5s" retries: 10 @@ -47,12 +47,12 @@ services: ports: - "6386:6379" clustering: - image: "valkey/valkey:${REDIS_VERSION:-9}" + image: "redis:${REDIS_VERSION:-8}" command: > bash -c "apt-get update > /dev/null && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null && rm -rf /var/lib/apt/lists/* - && yes yes | valkey-cli --cluster create + && yes yes | redis-cli --cluster create $$(dig node1 +short):6379 $$(dig node2 +short):6379 $$(dig node3 +short):6379 diff --git a/test/test_against_cluster_scale.rb b/test/test_against_cluster_scale.rb index 9f557c3..0f94630 100644 --- a/test/test_against_cluster_scale.rb +++ b/test/test_against_cluster_scale.rb @@ -127,7 +127,7 @@ def retryable(attempts:) class Single < TestingWrapper include Mixin - def self.test_order + def self.run_order :alpha end @@ -150,7 +150,7 @@ def do_test_after_scaled_in class Pipeline < TestingWrapper include Mixin - def self.test_order + def self.run_order :alpha end @@ -182,7 +182,7 @@ def do_test_after_scaled_in class Transaction < TestingWrapper include Mixin - def self.test_order + def self.run_order :alpha end @@ -218,7 +218,7 @@ def do_test_after_scaled_in class PubSub < TestingWrapper include Mixin - def self.test_order + def self.run_order :alpha end