lhm-shopify 3.4.0 → 3.5.5

data/spec/integration/chunker_spec.rb

@@ -29,7 +29,7 @@ describe Lhm::Chunker do
       Lhm::Chunker.new(@migration, connection, {throttler: throttler, printer: printer} ).run
 
       slave do
-        count_all(@destination.name).must_equal(1)
+        value(count_all(@destination.name)).must_equal(1)
       end
 
     end
@@ -42,7 +42,7 @@ describe Lhm::Chunker do
       Lhm::Chunker.new(@migration, connection, {throttler: throttler, printer: printer} ).run
 
       slave do
-        count_all(@destination.name).must_equal(2)
+        value(count_all(@destination.name)).must_equal(2)
       end
     end
 
@@ -58,7 +58,7 @@ describe Lhm::Chunker do
       Lhm::Chunker.new(migration, connection, {throttler: throttler, printer: printer} ).run
 
       slave do
-        count_all(destination.name).must_equal(2)
+        value(count_all(destination.name)).must_equal(2)
       end
     end
 
@@ -128,7 +128,7 @@ describe Lhm::Chunker do
       Lhm::Chunker.new(@migration, connection, {throttler: throttler, printer: printer} ).run
 
       slave do
-        count_all(@destination.name).must_equal(0)
+        value(count_all(@destination.name)).must_equal(0)
       end
 
     end
@@ -145,7 +145,7 @@ describe Lhm::Chunker do
       ).run
 
       slave do
-        count_all(@destination.name).must_equal(23)
+        value(count_all(@destination.name)).must_equal(23)
       end
 
       printer.verify
@@ -161,7 +161,7 @@ describe Lhm::Chunker do
       ).run
 
       slave do
-        count_all(@destination.name).must_equal(11)
+        value(count_all(@destination.name)).must_equal(11)
       end
 
     end
@@ -173,12 +173,15 @@ describe Lhm::Chunker do
       printer.expect(:notify, :return_value, [Integer, Integer])
       printer.expect(:end, :return_value, [])
 
+      Lhm::Throttler::Slave.any_instance.stubs(:slave_hosts).returns(['127.0.0.1'])
+      Lhm::Throttler::SlaveLag.any_instance.stubs(:master_slave_hosts).returns(['127.0.0.1'])
+
       Lhm::Chunker.new(
         @migration, connection, { throttler: Lhm::Throttler::SlaveLag.new(stride: 100), printer: printer }
       ).run
 
       slave do
-        count_all(@destination.name).must_equal(23)
+        value(count_all(@destination.name)).must_equal(23)
       end
 
       printer.verify
@@ -203,7 +206,7 @@ describe Lhm::Chunker do
       assert_equal(Lhm::Throttler::SlaveLag::INITIAL_TIMEOUT * 2 * 2, throttler.timeout_seconds)
 
       slave do
-        count_all(@destination.name).must_equal(15)
+        value(count_all(@destination.name)).must_equal(15)
       end
     end
 
@@ -215,17 +218,16 @@ describe Lhm::Chunker do
       printer.expects(:verify)
       printer.expects(:end)
 
-      throttler = Lhm::Throttler::SlaveLag.new(stride: 10, allowed_lag: 0)
+      Lhm::Throttler::Slave.any_instance.stubs(:slave_hosts).returns(['127.0.0.1'])
+      Lhm::Throttler::SlaveLag.any_instance.stubs(:master_slave_hosts).returns(['127.0.0.1'])
 
-      def throttler.slave_hosts
-        ['127.0.0.1']
-      end
+      throttler = Lhm::Throttler::SlaveLag.new(stride: 10, allowed_lag: 0)
 
       if master_slave_mode?
         def throttler.slave_connection(slave)
-          config = ActiveRecord::Base.connection_pool.spec.config.dup
+          config = ActiveRecord::Base.connection_pool.db_config.configuration_hash.dup
           config[:host] = slave
-          config[:port] = 3307
+          config[:port] = 33007
           ActiveRecord::Base.send('mysql2_connection', config)
         end
       end
@@ -238,7 +240,7 @@ describe Lhm::Chunker do
       assert_equal(0, throttler.send(:max_current_slave_lag))
 
       slave do
-        count_all(@destination.name).must_equal(15)
+        value(count_all(@destination.name)).must_equal(15)
       end
 
       printer.verify
@@ -260,7 +262,7 @@ describe Lhm::Chunker do
       assert_match "Verification failed, aborting early", exception.message
 
       slave do
-        count_all(@destination.name).must_equal(0)
+        value(count_all(@destination.name)).must_equal(0)
       end
     end
   end

data/spec/integration/cleanup_spec.rb

@@ -31,12 +31,13 @@ describe Lhm, 'cleanup' do
 
     describe 'cleanup' do
       it 'should show temporary tables' do
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup
         end
-        output.must_include('Would drop LHM backup tables')
-        output.must_match(/lhma_[0-9_]*_users/)
-        output.must_match(/lhma_[0-9_]*_permissions/)
+        value(output).must_include('Would drop LHM backup tables')
+        value(output).must_match(/lhma_[0-9_]*_users/)
+        value(output).must_match(/lhma_[0-9_]*_permissions/)
       end
 
       it 'should show temporary tables within range' do
@@ -48,12 +49,13 @@ describe Lhm, 'cleanup' do
         table_name2 = Lhm::Migration.new(table2, nil, nil, {}, Time.now - 172800).archive_name
         table_rename(:permissions, table_name2)
 
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup false, { :until => Time.now - 86400 }
         end
-        output.must_include('Would drop LHM backup tables')
-        output.must_match(/lhma_[0-9_]*_users/)
-        output.must_match(/lhma_[0-9_]*_permissions/)
+        value(output).must_include('Would drop LHM backup tables')
+        value(output).must_match(/lhma_[0-9_]*_users/)
+        value(output).must_match(/lhma_[0-9_]*_permissions/)
       end
 
       it 'should exclude temporary tables outside range' do
@@ -65,30 +67,40 @@ describe Lhm, 'cleanup' do
         table_name2 = Lhm::Migration.new(table2, nil, nil, {}, Time.now).archive_name
         table_rename(:permissions, table_name2)
 
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup false, { :until => Time.now - 172800 }
         end
-        output.must_include('Would drop LHM backup tables')
-        output.wont_match(/lhma_[0-9_]*_users/)
-        output.wont_match(/lhma_[0-9_]*_permissions/)
+        value(output).must_include('Would drop LHM backup tables')
+        value(output).wont_match(/lhma_[0-9_]*_users/)
+        value(output).wont_match(/lhma_[0-9_]*_permissions/)
       end
 
       it 'should show temporary triggers' do
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup
         end
-        output.must_include('Would drop LHM triggers')
-        output.must_include('lhmt_ins_users')
-        output.must_include('lhmt_del_users')
-        output.must_include('lhmt_upd_users')
-        output.must_include('lhmt_ins_permissions')
-        output.must_include('lhmt_del_permissions')
-        output.must_include('lhmt_upd_permissions')
+        value(output).must_include('Would drop LHM triggers')
+        value(output).must_include('lhmt_ins_users')
+        value(output).must_include('lhmt_del_users')
+        value(output).must_include('lhmt_upd_users')
+        value(output).must_include('lhmt_ins_permissions')
+        value(output).must_include('lhmt_del_permissions')
+        value(output).must_include('lhmt_upd_permissions')
       end
 
       it 'should delete temporary tables' do
-        Lhm.cleanup(true).must_equal(true)
-        Lhm.cleanup.must_equal(true)
+        value(Lhm.cleanup(true)).must_equal(true)
+        value(Lhm.cleanup).must_equal(true)
+      end
+
+      it 'outputs deleted tables and triggers' do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
+          Lhm.cleanup(true)
+        end
+        value(output).must_include('Dropped triggers lhmt_ins_users, lhmt_upd_users, lhmt_del_users, lhmt_ins_permissions, lhmt_upd_permissions, lhmt_del_permissions')
       end
     end
 
@@ -96,27 +108,26 @@ describe Lhm, 'cleanup' do
       it 'should show lhmn table for the specified table only' do
         table_create(:permissions)
         table_rename(:permissions, 'lhmn_permissions')
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup_current_run(false, 'permissions')
-        end.split("\n")
-
-        assert_equal "The following DDLs would be executed:", output[0]
-        assert_equal "drop trigger if exists lhmt_ins_permissions", output[1]
-        assert_equal "drop trigger if exists lhmt_upd_permissions", output[2]
-        assert_equal "drop trigger if exists lhmt_del_permissions", output[3]
-        assert_match(/rename table lhmn_permissions to lhma_[0-9_]*_permissions_failed/, output[4])
-        assert_equal 5, output.length
+        end
+
+        value(output).must_include("The following DDLs would be executed:")
+        value(output).must_include("drop trigger if exists lhmt_ins_permissions")
+        value(output).must_include("drop trigger if exists lhmt_upd_permissions")
+        value(output).must_include("drop trigger if exists lhmt_del_permissions")
       end
 
       it 'should show temporary triggers for the specified table only' do
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup_current_run(false, 'permissions')
-        end.split("\n")
-        assert_equal "The following DDLs would be executed:", output[0]
-        assert_equal "drop trigger if exists lhmt_ins_permissions", output[1]
-        assert_equal "drop trigger if exists lhmt_upd_permissions", output[2]
-        assert_equal "drop trigger if exists lhmt_del_permissions", output[3]
-        assert_equal 4, output.length
+        end
+        value(output).must_include("The following DDLs would be executed:")
+        value(output).must_include("drop trigger if exists lhmt_ins_permissions")
+        value(output).must_include("drop trigger if exists lhmt_upd_permissions")
+        value(output).must_include("drop trigger if exists lhmt_del_permissions")
       end
 
       it 'should delete temporary tables and triggers for the specified table only' do

data/spec/integration/database.yml

@@ -0,0 +1,25 @@
+master:
+  host: mysql-1
+  user: root
+  password: password
+  port: 33006
+slave:
+  host: mysql-2
+  user: root
+  password: password
+  port: 33007
+proxysql:
+  host: proxysql
+  user: root
+  password: password
+  port: 33005
+master_toxic:
+  host: toxiproxy
+  user: root
+  password: password
+  port: 22220
+proxysql_toxic:
+  host: toxiproxy
+  user: root
+  password: password
+  port: 22222

data/spec/integration/entangler_spec.rb

@@ -6,6 +6,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/integration_helper'
 require 'lhm/table'
 require 'lhm/migration'
 require 'lhm/entangler'
+require 'lhm/connection'
 
 describe Lhm::Entangler do
   include IntegrationHelper
@@ -17,7 +18,8 @@ describe Lhm::Entangler do
       @origin = table_create('origin')
       @destination = table_create('destination')
       @migration = Lhm::Migration.new(@origin, @destination)
-      @entangler = Lhm::Entangler.new(@migration, connection)
+      @connection = Lhm::Connection.new(connection: connection)
+      @entangler = Lhm::Entangler.new(@migration, @connection)
     end
 
     it 'should replay inserts from origin into destination' do
@@ -26,7 +28,7 @@ describe Lhm::Entangler do
       end
 
       slave do
-        count(:destination, 'common', 'inserted').must_equal(1)
+        value(count(:destination, 'common', 'inserted')).must_equal(1)
       end
     end
 
@@ -38,7 +40,7 @@ describe Lhm::Entangler do
       end
 
       slave do
-        count(:destination, 'common', 'inserted').must_equal(0)
+        value(count(:destination, 'common', 'inserted')).must_equal(0)
       end
     end
 
@@ -49,7 +51,7 @@ describe Lhm::Entangler do
       end
 
       slave do
-        count(:destination, 'common', 'updated').must_equal(1)
+        value(count(:destination, 'common', 'updated')).must_equal(1)
       end
     end
 
@@ -59,7 +61,7 @@ describe Lhm::Entangler do
       execute("insert into origin (common) values ('inserted')")
 
       slave do
-        count(:destination, 'common', 'inserted').must_equal(0)
+        value(count(:destination, 'common', 'inserted')).must_equal(0)
       end
     end
   end

data/spec/integration/integration_helper.rb

@@ -3,6 +3,7 @@
 require 'test_helper'
 require 'yaml'
 require 'active_support'
+require 'logger'
 
 begin
   $db_config = YAML.load_file(File.expand_path(File.dirname(__FILE__)) + '/database.yml')
@@ -34,13 +35,21 @@ module IntegrationHelper
     @connection
   end
 
+  def connect_proxysql!
+    connect!(
+      '127.0.0.1',
+      $db_config['proxysql']['port'],
+      $db_config['proxysql']['user'],
+      $db_config['proxysql']['password'],
+    )
+  end
+
   def connect_master!
     connect!(
       '127.0.0.1',
       $db_config['master']['port'],
       $db_config['master']['user'],
       $db_config['master']['password'],
-      $db_config['master']['socket']
     )
   end
 
@@ -50,28 +59,33 @@ module IntegrationHelper
       $db_config['slave']['port'],
       $db_config['slave']['user'],
       $db_config['slave']['password'],
-      $db_config['slave']['socket']
     )
   end
 
-  def connect!(hostname, port, user, password, socket)
-    adapter = ar_conn(hostname, port, user, password, socket)
-    Lhm.setup(adapter)
+  def connect_master_with_toxiproxy!
+    connect!(
+      '127.0.0.1',
+      $db_config['master_toxic']['port'],
+      $db_config['master_toxic']['user'],
+      $db_config['master_toxic']['password'])
+  end
+
+  def connect!(hostname, port, user, password)
+    Lhm.setup(ar_conn(hostname, port, user, password))
     unless defined?(@@cleaned_up)
       Lhm.cleanup(true)
       @@cleaned_up  = true
     end
-    @connection = adapter
+    @connection = Lhm.connection
   end
 
-  def ar_conn(host, port, user, password, socket)
+  def ar_conn(host, port, user, password)
     ActiveRecord::Base.establish_connection(
       :adapter  => 'mysql2',
       :host     => host,
       :username => user,
       :port     => port,
       :password => password,
-      :socket   => socket,
       :database => $db_name
     )
     ActiveRecord::Base.connection
@@ -121,7 +135,7 @@ module IntegrationHelper
   # Helps testing behaviour when another client locks the db
   def start_locking_thread(lock_for, queue, locking_query)
     Thread.new do
-      conn = Mysql2::Client.new(host: '127.0.0.1', database: $db_name, user: 'root', port: 3306)
+      conn = new_mysql_connection
       conn.query('BEGIN')
       conn.query(locking_query)
       queue.push(true)
@@ -212,7 +226,8 @@ module IntegrationHelper
   def capture_stdout
     out = StringIO.new
     $stdout = out
-    yield
+    logger = Logger.new($stdout)
+    yield logger
     return out.string
   ensure
     $stdout = ::STDOUT