fix formatting issues, increase binlog size between tests, and fix error messages

Author: Saadkhalid913

lib/lhm/chunker.rb

@@ -37,7 +37,6 @@ def initialize(migration, connection = nil, options = {})
       )
     end
 
-
     def handle_max_binlog_exceeded_error
       @throttler.backoff_stride
     end
@@ -126,6 +125,5 @@ def validate
       return if @chunk_finder.table_empty?
       @chunk_finder.validate
     end
-
   end
 end

lib/lhm/throttler/time.rb

@@ -18,19 +18,22 @@ def initialize(options = {})
         @min_stride_size = options[:min_stride_size] || MIN_STRIDE_SIZE
 
         if @backoff_reduction_factor >= 1 || @backoff_reduction_factor <= 0
-          raise ArgumentError, 'backoff_reduction_factor must be between 0 and 1'
+          raise ArgumentError, 'backoff_reduction_factor must be between greater than 0, and less than 1'
         end
 
         if @min_stride_size < 1
-          raise ArgumentError, 'min_stride_size must be greater than 0'
+          raise ArgumentError, 'min_stride_size must be and integer greater than 0'
+        end
+
+        if !@min_stride_size.is_a?(Integer)
+          raise ArgumentError, 'min_stride_size must be an integer'
         end
 
         if @min_stride_size > @stride
           raise ArgumentError, 'min_stride_size must be less than or equal to stride'
         end
       end
 
-
       def backoff_stride
         new_stride = (@stride * (1 - @backoff_reduction_factor)).to_i
 

spec/integration/chunker_spec.rb

@@ -18,7 +18,7 @@
       @migration = Lhm::Migration.new(@origin, @destination)
       @logs = StringIO.new
       Lhm.logger = Logger.new(@logs)
-      set_max_binlog_size(1024 * 1024 * 100) # not sure if this is needed (iirc tests rollback all db changes)
+      set_max_binlog_size(1024 * 1024 * 1024) # necessary since some tests recude binlog size (1gb default)
     end
 
     def log_messages
@@ -310,11 +310,8 @@ def throttler.replica_connection(replica)
     end
 
     it 'should reduce stride size if chunker runs into max_binlog_cache_size error' do
-
       init_stride = 1000
 
-
-
       # Create a bunch of users
       n = 0
       25.times do |i|
@@ -328,45 +325,41 @@ def throttler.replica_connection(replica)
         execute "COMMIT"
       end
 
-
       # reduce binlog size to 8kb
       set_max_binlog_size(1024 * 8)
 
-
       throttler = Lhm::Throttler::Time.new(stride: init_stride )
-
       chunker = Lhm::Chunker.new(
         @migration, connection, { throttler: throttler  }
-    )
-
+      )
 
       # start chunking
       chunker.run
       assert init_stride > throttler.stride
     end
 
-    it 'should throw an error when stride cannot be reduced beyond min stride size' do
 
-      init_stride = 1000
+    it 'should throw an error when stride cannot be reduced beyond min stride size' do
+      init_stride = 100
       min_stride_size = 50
 
       # Create a bunch of users
       n = 0
       25.times do |i|
         execute "BEGIN"
-        init_stride.times do # each batch is 10 * 1000 * i bytes, so each batch of 1000 will range from 10kb - 250kb
+        init_stride.times do # each batch is init_stride * 250 bytes, so even at min_stride of 20,
+                             # batch_size will be greater than 4kb (50 * 250kb = 12.5kb)
           n += 1
           id = n
-          username_data = "a" * 10 * 25
+          username_data = "a" * 250
           execute "insert into origin (id, common) values (#{id}, '#{username_data}')"
         end
         execute "COMMIT"
       end
 
-
       # reduce binlog size to 4kb
       set_max_binlog_size(1024 * 4)
-      throttler = Lhm::Throttler::Time.new(stride: init_stride, min_stride_size: min_stride_size, backoff_reduction_factor: 0.5)
+      throttler = Lhm::Throttler::Time.new(stride: init_stride, min_stride_size: min_stride_size, backoff_reduction_factor: 0.9)
 
       chunker = Lhm::Chunker.new(
         @migration, connection, { throttler: throttler  }
@@ -379,7 +372,6 @@ def throttler.replica_connection(replica)
 
       assert RuntimeError = exception.class
       assert "Cannot reduce stride below #{min_stride_size}" == exception.message
-
     end
   end
 

spec/unit/throttler_spec.rb

@@ -140,7 +140,7 @@ def @instance.timeout_seconds
       end
     end
 
-    it 'should throw an error when backoff reduction factor is greater than zero' do
+    it 'should throw an error when backoff reduction factor is not greater than zero' do
       assert_raises ArgumentError do
         @mock.setup_throttler(:time_throttler, backoff_reduction_factor: 0)
       end
@@ -152,12 +152,18 @@ def @instance.timeout_seconds
       end
     end
 
-    it 'should throw an error when min_stride_size is less than 1' do
+    it 'should throw an error when min_stride_size is not an integer' do
       assert_raises ArgumentError do
         @mock.setup_throttler(:time_throttler, min_stride_size: 0.5)
       end
     end
 
+    it 'should throw an error when min_stride_size is not greater than 1' do
+      assert_raises ArgumentError do
+        @mock.setup_throttler(:time_throttler, min_stride_size: -12)
+      end
+    end
+
     it 'should throw an error when min_stride_size is greater than inital stride size' do
       assert_raises ArgumentError do
         @mock.setup_throttler(:time_throttler, min_stride_size: 1000, stride: 500)