test: fix resharding test for scale reading (#139)

Author: supercaracal

.rubocop.yml

@@ -30,6 +30,9 @@ Metrics/BlockLength:
   Exclude:
     - 'test/**/*'
 
+Metrics/ParameterLists:
+  Max: 10
+
 Layout/LineLength:
   Max: 200
 

lib/redis_client/cluster/node.rb

@@ -105,7 +105,7 @@ def parse_node_info(info) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticC
         end
       end
 
-      def initialize( # rubocop:disable Metrics/ParameterLists
+      def initialize(
         options,
         node_info: [],
         with_replica: false,

lib/redis_client/cluster/node/latency_replica.rb

@@ -34,7 +34,7 @@ def find_node_key_of_replica(primary_node_key, seed: nil) # rubocop:disable Lint
 
         def any_replica_node_key(seed: nil)
           random = seed.nil? ? Random : Random.new(seed)
-          @existed_replicas.sample(random: random)&.first
+          @existed_replicas.sample(random: random)&.first || any_primary_node_key(seed: seed)
         end
 
         private

lib/redis_client/cluster/node/random_replica.rb

@@ -29,7 +29,7 @@ def find_node_key_of_replica(primary_node_key, seed: nil)
 
         def any_replica_node_key(seed: nil)
           random = seed.nil? ? Random : Random.new(seed)
-          @replica_node_keys.sample(random: random)
+          @replica_node_keys.sample(random: random) || any_primary_node_key(seed: seed)
         end
       end
     end

lib/redis_client/cluster/router.rb

@@ -63,8 +63,7 @@ def send_command(method, command, *args, &block) # rubocop:disable Metrics/AbcSi
         raise
       end
 
-      # @see https://redis.io/topics/cluster-spec#redirection-and-resharding
-      #   Redirection and resharding
+      # @see https://redis.io/docs/reference/cluster-spec/#redirection-and-resharding Redirection and resharding
       def try_send(node, method, command, args, retry_count: 3, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         if args.empty?
           # prevent memory allocation for variable-length args

lib/redis_client/cluster_config.rb

@@ -22,7 +22,7 @@ class ClusterConfig
 
     attr_reader :command_builder, :client_config, :replica_affinity
 
-    def initialize( # rubocop:disable Metrics/ParameterLists
+    def initialize(
       nodes: DEFAULT_NODES,
       replica: false,
       replica_affinity: :random,

test/test_against_cluster_state.rb

@@ -17,7 +17,6 @@ def setup
     end
 
     def teardown
-      @controller.rebuild
       @controller.close
       @client.close
     end
@@ -90,47 +89,80 @@ def do_resharding_test(number_of_keys: 1000)
   class PrimaryOnly < TestingWrapper
     include Mixin
 
+    private
+
+    def new_test_client
+      ::RedisClient.cluster(
+        nodes: TEST_NODE_URIS,
+        fixed_hostname: TEST_FIXED_HOSTNAME,
+        **TEST_GENERIC_OPTIONS
+      ).new_client
+    end
+  end
+
+  class ScaleReadRandom < TestingWrapper
+    include Mixin
+
+    def test_the_state_of_cluster_resharding
+      keys = nil
+      do_resharding_test { |ks| keys = ks }
+      keys.each { |key| assert_equal(key, @client.call('GET', key), "Case: GET: #{key}") }
+    end
+
+    def test_the_state_of_cluster_resharding_with_pipelining
+      keys = nil
+      do_resharding_test { |ks| keys = ks }
+      values = @client.pipelined { |pipeline| keys.each { |key| pipeline.call('GET', key) } }
+      keys.each_with_index { |key, i| assert_equal(key, values[i], "Case: GET: #{key}") }
+    end
+
+    private
+
     def new_test_client
       ::RedisClient.cluster(
         nodes: TEST_NODE_URIS,
+        replica: true,
+        replica_affinity: :random,
         fixed_hostname: TEST_FIXED_HOSTNAME,
         **TEST_GENERIC_OPTIONS
       ).new_client
     end
   end
 
-  # # TODO: https://github.com/redis-rb/redis-cluster-client/issues/42
-  # class ScaleReadRandom < TestingWrapper
-  #   include Mixin
-  #
-  #   def new_test_client
-  #     ::RedisClient.cluster(
-  #       nodes: TEST_NODE_URIS,
-  #       replica: true,
-  #       replica_affinity: :random,
-  #       fixed_hostname: TEST_FIXED_HOSTNAME,
-  #       **TEST_GENERIC_OPTIONS
-  #     ).new_client
-  #   end
-  # end
-  #
-  # class ScaleReadLatency < TestingWrapper
-  #   include Mixin
-  #
-  #   def new_test_client
-  #     ::RedisClient.cluster(
-  #       nodes: TEST_NODE_URIS,
-  #       replica: true,
-  #       replica_affinity: :latency,
-  #       fixed_hostname: TEST_FIXED_HOSTNAME,
-  #       **TEST_GENERIC_OPTIONS
-  #     ).new_client
-  #   end
-  # end
+  class ScaleReadLatency < TestingWrapper
+    include Mixin
+
+    def test_the_state_of_cluster_resharding
+      keys = nil
+      do_resharding_test { |ks| keys = ks }
+      keys.each { |key| assert_equal(key, @client.call('GET', key), "Case: GET: #{key}") }
+    end
+
+    def test_the_state_of_cluster_resharding_with_pipelining
+      keys = nil
+      do_resharding_test { |ks| keys = ks }
+      values = @client.pipelined { |pipeline| keys.each { |key| pipeline.call('GET', key) } }
+      keys.each_with_index { |key, i| assert_equal(key, values[i], "Case: GET: #{key}") }
+    end
+
+    private
+
+    def new_test_client
+      ::RedisClient.cluster(
+        nodes: TEST_NODE_URIS,
+        replica: true,
+        replica_affinity: :latency,
+        fixed_hostname: TEST_FIXED_HOSTNAME,
+        **TEST_GENERIC_OPTIONS
+      ).new_client
+    end
+  end
 
   class Pooled < TestingWrapper
     include Mixin
 
+    private
+
     def new_test_client
       ::RedisClient.cluster(
         nodes: TEST_NODE_URIS,