test: fix memory profiling settings (#175)

Author: supercaracal

.github/workflows/test.yaml

@@ -348,6 +348,8 @@ jobs:
     timeout-minutes: 15
     strategy:
       fail-fast: false
+      matrix:
+        mode: ['single', 'excessive_pipelining', 'pipelining_in_moderation']
     runs-on: ubuntu-latest
     env:
       REDIS_VERSION: '7.0.1'
@@ -370,5 +372,7 @@ jobs:
         run: docker compose -f $DOCKER_COMPOSE_FILE ps
       - name: Run memory profiler
         run: bundle exec rake prof
+        env:
+          MEMORY_PROFILE_MODE: ${{ matrix.mode }}
       - name: Stop containers
         run: docker compose -f $DOCKER_COMPOSE_FILE down

.rubocop.yml

@@ -8,7 +8,7 @@ require:
 AllCops:
   TargetRubyVersion: 2.7
   DisplayCopNames: true
-  NewCops: enable
+  NewCops: disable
 
 Metrics/AbcSize:
   Exclude:

test/benchmark_mixin.rb

@@ -10,7 +10,7 @@ def setup
   end
 
   def teardown
-    @client.call('FLUSHDB')
+    @client&.call('FLUSHDB')
     wait_for_replication
     @client&.close
   end
@@ -74,7 +74,7 @@ def bench_pipeline_get
   def wait_for_replication
     client_side_timeout = TEST_TIMEOUT_SEC + 1.0
     server_side_timeout = (TEST_TIMEOUT_SEC * 1000).to_i
-    @client.blocking_call(client_side_timeout, 'WAIT', TEST_REPLICA_SIZE, server_side_timeout)
+    @client&.blocking_call(client_side_timeout, 'WAIT', TEST_REPLICA_SIZE, server_side_timeout)
   end
 end
 
@@ -87,7 +87,7 @@ def setup
   end
 
   def teardown
-    @cluster_client.call('FLUSHDB')
+    @cluster_client&.call('FLUSHDB')
     wait_for_replication
     @cluster_client&.close
     @client&.close
@@ -102,6 +102,6 @@ def new_cluster_client
   def wait_for_replication
     client_side_timeout = TEST_TIMEOUT_SEC + 1.0
     server_side_timeout = (TEST_TIMEOUT_SEC * 1000).to_i
-    @cluster_client.blocking_call(client_side_timeout, 'WAIT', TEST_REPLICA_SIZE, server_side_timeout)
+    @cluster_client&.blocking_call(client_side_timeout, 'WAIT', TEST_REPLICA_SIZE, server_side_timeout)
   end
 end

test/cluster_controller.rb

@@ -253,7 +253,7 @@ def flush_all_data(clients)
     clients.each do |c|
       c.call('FLUSHALL')
       print_debug("#{c.config.host}:#{c.config.port} ... FLUSHALL")
-    rescue ::RedisClient::CommandError
+    rescue ::RedisClient::CommandError, ::RedisClient::ReadOnlyError
       # READONLY You can't write against a read only replica.
       nil
     end

test/prof_mem.rb

@@ -8,25 +8,48 @@ module ProfMem
   module_function
 
   ATTEMPT_COUNT = 1000
+  MAX_PIPELINE_SIZE = 30
+  SLICED_NUMBERS = Array.new(ATTEMPT_COUNT) { |i| i }.each_slice(MAX_PIPELINE_SIZE).freeze
+  CLI_TYPES = %w[primary_only scale_read_random scale_read_latency pooled].freeze
+  MODES = {
+    single: lambda do |client_builder_method|
+      cli = send(client_builder_method)
+      ATTEMPT_COUNT.times { |i| cli.call('SET', i, i) }
+      ATTEMPT_COUNT.times { |i| cli.call('GET', i) }
+    end,
+    excessive_pipelining: lambda do |client_builder_method|
+      cli = send(client_builder_method)
+      cli.pipelined do |pi|
+        ATTEMPT_COUNT.times { |i| pi.call('SET', i, i) }
+      end
 
-  def run
-    %w[primary_only scale_read_random scale_read_latency pooled].each do |cli_type|
-      prepare
-      print_letter(cli_type, 'w/ pipelining')
-      profile do
-        send("new_#{cli_type}_client".to_sym).pipelined do |pi|
-          ATTEMPT_COUNT.times { |i| pi.call('SET', i, i) }
-          ATTEMPT_COUNT.times { |i| pi.call('GET', i) }
+      cli.pipelined do |pi|
+        ATTEMPT_COUNT.times { |i| pi.call('GET', i) }
+      end
+    end,
+    pipelining_in_moderation: lambda do |client_builder_method|
+      cli = send(client_builder_method)
+      SLICED_NUMBERS.each do |numbers|
+        cli.pipelined do |pi|
+          numbers.each { |i| pi.call('SET', i, i) }
+        end
+
+        cli.pipelined do |pi|
+          numbers.each { |i| pi.call('GET', i) }
         end
       end
+    end
+  }.freeze
 
+  def run
+    mode = ENV.fetch('MEMORY_PROFILE_MODE', :single).to_sym
+    subject = MODES.fetch(mode)
+
+    CLI_TYPES.each do |cli_type|
       prepare
-      print_letter(cli_type, 'w/o pipelining')
-      profile do
-        cli = send("new_#{cli_type}_client".to_sym)
-        ATTEMPT_COUNT.times { |i| cli.call('SET', i, i) }
-        ATTEMPT_COUNT.times { |i| cli.call('GET', i) }
-      end
+      print_letter(mode, cli_type)
+      client_builder_method = "new_#{cli_type}_client".to_sym
+      profile { subject.call(client_builder_method) }
     end
   end
 

test/redis_client/cluster/test_normalized_cmd_name.rb

@@ -11,7 +11,7 @@ def setup
       end
 
       def teardown
-        @subject.clear
+        @subject&.clear
       end
 
       def test_get_by_command

test/redis_client/test_cluster.rb

@@ -253,7 +253,7 @@ def test_compatibility_with_redis_gem
       def wait_for_replication
         client_side_timeout = TEST_TIMEOUT_SEC + 1.0
         server_side_timeout = (TEST_TIMEOUT_SEC * 1000).to_i
-        @client.blocking_call(client_side_timeout, 'WAIT', TEST_REPLICA_SIZE, server_side_timeout)
+        @client&.blocking_call(client_side_timeout, 'WAIT', TEST_REPLICA_SIZE, server_side_timeout)
       end
     end
 

test/test_against_cluster_broken.rb

@@ -20,8 +20,8 @@ def setup
   end
 
   def teardown
-    @client.close
-    @controller.close
+    @client&.close
+    @controller&.close
   end
 
   def test_a_replica_is_down

test/test_against_cluster_state.rb

@@ -17,8 +17,8 @@ def setup
     end
 
     def teardown
-      @controller.close
-      @client.close
+      @controller&.close
+      @client&.close
     end
 
     def test_the_state_of_cluster_down

test/test_concurrency.rb

@@ -13,7 +13,7 @@ def setup
   end
 
   def teardown
-    @client.close
+    @client&.close
   end
 
   def test_forking