Add cluster state test (#38)

Author: supercaracal

.github/workflows/test.yaml

@@ -33,12 +33,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        redis: ['6.2.7', '7.0.1']
+        redis: ['7.0.1', '6.2.7']
         ruby: ['3.1', '3.0', '2.7']
         driver: ['ruby'] # FIXME: freaky hiredis
         docker: ['docker-compose.yaml', 'docker-compose.ssl.yaml']
-        os: ['ubuntu-latest']
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     env:
       REDIS_VERSION: ${{ matrix.redis }}
       REDIS_CONNECTION_DRIVER: ${{ matrix.driver }}
@@ -93,3 +92,35 @@ jobs:
         run: bundle exec rake test
       - name: Stop containers
         run: docker compose -f $DOCKER_COMPOSE_FILE down
+  cluster-state:
+    name: Cluster State
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        redis: ['7.0.1', '6.2.7']
+    runs-on: ubuntu-latest
+    env:
+      REDIS_VERSION: ${{ matrix.redis }}
+      REDIS_REPLICA_SIZE: '2'
+      DOCKER_COMPOSE_FILE: 'docker-compose.replica.yaml'
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.1'
+          bundler-cache: true
+      - name: Pull Docker images
+        run: docker pull redis:$REDIS_VERSION
+      - name: Run containers
+        run: docker compose -f $DOCKER_COMPOSE_FILE up -d
+      - name: Wait for Redis cluster to be ready
+        run: bundle exec rake wait
+      - name: Print containers
+        run: docker compose -f $DOCKER_COMPOSE_FILE ps
+      - name: Run minitest
+        run: bundle exec rake test_cluster_state
+      - name: Stop containers
+        run: docker compose -f $DOCKER_COMPOSE_FILE down

Rakefile

@@ -7,14 +7,23 @@ task default: :test
 Rake::TestTask.new :test do |t|
   t.libs << :test
   t.libs << :lib
-  t.test_files = ARGV.size == 1 ? Dir['test/**/test_*.rb'] : ARGV[1..]
+  files = Dir['test/**/test_*.rb'].grep_v(/test_against_cluster_state/)
+  files = ARGV[1..] if ARGV.size > 1
+  t.test_files = files
+  t.options = '-v'
+end
+
+Rake::TestTask.new :test_cluster_state do |t|
+  t.libs << :test
+  t.libs << :lib
+  t.test_files = %w[test/test_against_cluster_state.rb]
   t.options = '-v'
 end
 
 desc 'Wait for cluster to be ready'
 task :wait do
   $LOAD_PATH.unshift(File.expand_path('test', __dir__))
-  require 'constants'
+  require 'testing_constants'
   require 'cluster_controller'
   ::ClusterController.new(
     TEST_NODE_URIS,

lib/redis_client/cluster.rb

@@ -40,6 +40,7 @@ def empty?
         @size.zero?
       end
 
+      # TODO: https://github.com/redis-rb/redis-cluster-client/issues/37
       def execute # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
         all_replies = Array.new(@size)
         threads = @grouped.map do |k, v|
@@ -185,7 +186,7 @@ def send_command(method, *command, **kwargs, &block) # rubocop:disable Metrics/A
         @node.call_all(method, *command, **kwargs, &block).first
       when 'flushall', 'flushdb'
         @node.call_primary(method, *command, **kwargs, &block).first
-      when 'wait'     then @node.call_primary(method, *command, **kwargs, &block).sum
+      when 'wait'     then send_wait_command(method, *command, **kwargs, &block)
       when 'keys'     then @node.call_replica(method, *command, **kwargs, &block).flatten.sort
       when 'dbsize'   then @node.call_replica(method, *command, **kwargs, &block).sum
       when 'scan'     then _scan(*command, **kwargs)
@@ -207,6 +208,16 @@ def send_command(method, *command, **kwargs, &block) # rubocop:disable Metrics/A
       end
     end
 
+    def send_wait_command(method, *command, retry_count: 3, **kwargs, &block)
+      @node.call_primary(method, *command, **kwargs, &block).sum
+    rescue RedisClient::Cluster::CommandErrorCollection => e
+      raise if e.errors.values.map(&:message).grep(/ERR WAIT cannot be used with replica instances/).size.zero?
+
+      update_cluster_info!
+      retry_count -= 1
+      retry
+    end
+
     def send_config_command(method, *command, **kwargs, &block)
       case command[1].to_s.downcase
       when 'resetstat', 'rewrite', 'set'