lhm-shopify 3.5.5 → 4.1.0

data/spec/unit/throttler/{slave_lag_spec.rb → replica_lag_spec.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../unit_helper'
 
-require 'lhm/throttler/slave_lag'
+require 'lhm/throttler/replica_lag'
 
 describe Lhm::Throttler do
   include UnitHelper
@@ -32,7 +32,7 @@ describe Lhm::Throttler do
   end
 end
 
-describe Lhm::Throttler::Slave do
+describe Lhm::Throttler::Replica do
   include UnitHelper
 
   before :each do
@@ -43,31 +43,23 @@ describe Lhm::Throttler::Slave do
   end
 
   describe "#client" do
-    before do
-      class TestMysql2Client
-        def initialize(config)
-          raise Mysql2::Error.new("connection error")
-        end
-      end
-    end
-
     describe 'on connection error' do
       it 'logs and returns nil' do
-        assert_nil(Lhm::Throttler::Slave.new('slave', @dummy_mysql_client_config).connection)
+        assert_nil(Lhm::Throttler::Replica.new('replica', @dummy_mysql_client_config).connection)
 
         log_messages = @logs.string.lines
         assert_equal(2, log_messages.length)
-        assert log_messages[0].include? "Connecting to slave on database: db"
-        assert log_messages[1].include? "Error connecting to slave: Unknown MySQL server host 'slave'"
+        assert log_messages[0].include? "Connecting to replica on database: db"
+        assert log_messages[1].include? "Error connecting to replica"
       end
     end
 
     describe 'with proper config' do
-      it "creates a new Mysql2::Client" do
-        expected_config = { username: 'user', password: 'pw', database: 'db', host: 'slave' }
-        Mysql2::Client.stubs(:new).with(expected_config).returns(mock())
+      it "creates a new database client" do
+        expected_config = { username: 'user', password: 'pw', database: 'db', host: 'replica' }
+        DATABASE.client.stubs(:new).with(expected_config).returns(mock())
 
-        assert Lhm::Throttler::Slave.new('slave', @dummy_mysql_client_config).connection
+        assert Lhm::Throttler::Replica.new('replica', @dummy_mysql_client_config).connection
       end
     end
 
@@ -80,13 +72,13 @@ describe Lhm::Throttler::Slave do
           ActiveRecord::Base.stubs(:connection_pool).returns(stub(spec: stub(config: active_record_config)))
         end
 
-        Mysql2::Client.stubs(:new).returns(mock())
+        DATABASE.client.stubs(:new).returns(mock())
 
-        assert Lhm::Throttler::Slave.new('slave').connection
+        assert Lhm::Throttler::Replica.new('replica').connection
 
         log_messages = @logs.string.lines
         assert_equal(1, log_messages.length)
-        assert log_messages[0].include? "Connecting to slave on database: db"
+        assert log_messages[0].include? "Connecting to replica on database: db"
       end
     end
   end
@@ -95,16 +87,16 @@ describe Lhm::Throttler::Slave do
     before do
       class Connection
         def self.query(query)
-          if query == Lhm::Throttler::Slave::SQL_SELECT_MAX_SLAVE_LAG
+          if query == Lhm::Throttler::Replica::SQL_SELECT_MAX_REPLICA_LAG
             [{ 'Seconds_Behind_Master' => 20 }]
-          elsif query == Lhm::Throttler::Slave::SQL_SELECT_SLAVE_HOSTS
+          elsif query == Lhm::Throttler::Replica::SQL_SELECT_REPLICA_HOSTS
             [{ 'host' => '1.1.1.1:80' }]
           end
         end
       end
 
-      @slave = Lhm::Throttler::Slave.new('slave', @dummy_mysql_client_config)
-      @slave.instance_variable_set(:@connection, Connection)
+      @replica = Lhm::Throttler::Replica.new('replica', @dummy_mysql_client_config)
+      @replica.instance_variable_set(:@connection, Connection)
 
       class StoppedConnection
         def self.query(query)
@@ -112,54 +104,54 @@ describe Lhm::Throttler::Slave do
         end
       end
 
-      @stopped_slave = Lhm::Throttler::Slave.new('stopped_slave', @dummy_mysql_client_config)
-      @stopped_slave.instance_variable_set(:@connection, StoppedConnection)
+      @stopped_replica = Lhm::Throttler::Replica.new('stopped_replica', @dummy_mysql_client_config)
+      @stopped_replica.instance_variable_set(:@connection, StoppedConnection)
     end
 
     describe "#lag" do
-      it "returns the slave lag" do
-        assert_equal(20, @slave.lag)
+      it "returns the replica lag" do
+        assert_equal(20, @replica.lag)
       end
     end
 
-    describe "#lag with a stopped slave" do
-      it "returns 0 slave lag" do
-        assert_equal(0, @stopped_slave.lag)
+    describe "#lag with a stopped replica" do
+      it "returns 0 replica lag" do
+        assert_equal(0, @stopped_replica.lag)
       end
     end
 
-    describe "#slave_hosts" do
+    describe "#replica_hosts" do
       it "returns the hosts" do
-        assert_equal(['1.1.1.1'], @slave.slave_hosts)
+        assert_equal(['1.1.1.1'], @replica.replica_hosts)
       end
     end
 
     describe "#lag on connection error" do
-      it "logs and returns 0 slave lag" do
+      it "logs and returns 0 replica lag" do
         client = mock()
-        client.stubs(:query).raises(Mysql2::Error, "Can't connect to MySQL server")
-        Lhm::Throttler::Slave.any_instance.stubs(:client).returns(client)
-        Lhm::Throttler::Slave.any_instance.stubs(:config).returns([])
+        client.stubs(:query).raises(DATABASE.error_class, "Can't connect to MySQL server")
+        Lhm::Throttler::Replica.any_instance.stubs(:client).returns(client)
+        Lhm::Throttler::Replica.any_instance.stubs(:config).returns([])
 
-        slave = Lhm::Throttler::Slave.new('slave', @dummy_mysql_client_config)
-        Logger.any_instance.expects(:info).with("Unable to connect and/or query slave: Can't connect to MySQL server")
-        assert_equal(0, slave.lag)
+        replica = Lhm::Throttler::Replica.new('replica', @dummy_mysql_client_config)
+        Logger.any_instance.expects(:info).with("Unable to connect and/or query replica: Can't connect to MySQL server")
+        assert_equal(0, replica.lag)
       end
     end
   end
 end
 
-describe Lhm::Throttler::SlaveLag do
+describe Lhm::Throttler::ReplicaLag do
   include UnitHelper
 
   before :each do
-    @throttler = Lhm::Throttler::SlaveLag.new
+    @throttler = Lhm::Throttler::ReplicaLag.new
   end
 
   describe '#throttle_seconds' do
-    describe 'with no slave lag' do
+    describe 'with no replica lag' do
       before do
-        def @throttler.max_current_slave_lag
+        def @throttler.max_current_replica_lag
           0
         end
       end
@@ -170,9 +162,9 @@ describe Lhm::Throttler::SlaveLag do
       end
     end
 
-    describe 'with a large slave lag' do
+    describe 'with a large replica lag' do
       before do
-        def @throttler.max_current_slave_lag
+        def @throttler.max_current_replica_lag
           100
         end
       end
@@ -183,14 +175,14 @@ describe Lhm::Throttler::SlaveLag do
       end
 
       it 'does not increase the timeout past the maximum' do
-        @throttler.timeout_seconds = Lhm::Throttler::SlaveLag::MAX_TIMEOUT
-        assert_equal(Lhm::Throttler::SlaveLag::MAX_TIMEOUT, @throttler.send(:throttle_seconds))
+        @throttler.timeout_seconds = Lhm::Throttler::ReplicaLag::MAX_TIMEOUT
+        assert_equal(Lhm::Throttler::ReplicaLag::MAX_TIMEOUT, @throttler.send(:throttle_seconds))
       end
     end
 
-    describe 'with no slave lag after it has previously been increased' do
+    describe 'with no replica lag after it has previously been increased' do
       before do
-        def @throttler.max_current_slave_lag
+        def @throttler.max_current_replica_lag
           0
         end
       end
@@ -202,56 +194,56 @@ describe Lhm::Throttler::SlaveLag do
       end
 
       it 'does not decrease the timeout past the minimum on repeated runs' do
-        @throttler.timeout_seconds = Lhm::Throttler::SlaveLag::INITIAL_TIMEOUT * 2
-        assert_equal(Lhm::Throttler::SlaveLag::INITIAL_TIMEOUT, @throttler.send(:throttle_seconds))
-        assert_equal(Lhm::Throttler::SlaveLag::INITIAL_TIMEOUT, @throttler.send(:throttle_seconds))
+        @throttler.timeout_seconds = Lhm::Throttler::ReplicaLag::INITIAL_TIMEOUT * 2
+        assert_equal(Lhm::Throttler::ReplicaLag::INITIAL_TIMEOUT, @throttler.send(:throttle_seconds))
+        assert_equal(Lhm::Throttler::ReplicaLag::INITIAL_TIMEOUT, @throttler.send(:throttle_seconds))
       end
     end
   end
 
-  describe '#max_current_slave_lag' do
-    describe 'with multiple slaves' do
+  describe '#max_current_replica_lag' do
+    describe 'with multiple replicas' do
       it 'returns the largest amount of lag' do
-        slave1 = mock()
-        slave2 = mock()
-        slave1.stubs(:lag).returns(5)
-        slave2.stubs(:lag).returns(0)
-        Lhm::Throttler::SlaveLag.any_instance.stubs(:slaves).returns([slave1, slave2])
-        assert_equal 5, @throttler.send(:max_current_slave_lag)
+        replica1 = mock()
+        replica2 = mock()
+        replica1.stubs(:lag).returns(5)
+        replica2.stubs(:lag).returns(0)
+        Lhm::Throttler::ReplicaLag.any_instance.stubs(:replicas).returns([replica1, replica2])
+        assert_equal 5, @throttler.send(:max_current_replica_lag)
       end
     end
 
-    describe 'with MySQL stopped on the slave' do
-      it 'assumes 0 slave lag' do
+    describe 'with MySQL stopped on the replica' do
+      it 'assumes 0 replica lag' do
         client = mock()
-        client.stubs(:query).raises(Mysql2::Error, "Can't connect to MySQL server")
-        Lhm::Throttler::Slave.any_instance.stubs(:client).returns(client)
+        client.stubs(:query).raises(DATABASE.error_class, "Can't connect to MySQL server")
+        Lhm::Throttler::Replica.any_instance.stubs(:client).returns(client)
 
-        Lhm::Throttler::Slave.any_instance.stubs(:prepare_connection_config).returns([])
-        Lhm::Throttler::Slave.any_instance.stubs(:slave_hosts).returns(['1.1.1.2'])
-        @throttler.stubs(:master_slave_hosts).returns(['1.1.1.1'])
+        Lhm::Throttler::Replica.any_instance.stubs(:prepare_connection_config).returns([])
+        Lhm::Throttler::Replica.any_instance.stubs(:replica_hosts).returns(['1.1.1.2'])
+        @throttler.stubs(:master_replica_hosts).returns(['1.1.1.1'])
 
-        assert_equal 0, @throttler.send(:max_current_slave_lag)
+        assert_equal 0, @throttler.send(:max_current_replica_lag)
       end
     end
   end
 
-  describe '#get_slaves' do
-    describe 'with no slaves' do
+  describe '#get_replicas' do
+    describe 'with no replicas' do
       before do
-        def @throttler.master_slave_hosts
+        def @throttler.master_replica_hosts
           []
         end
       end
 
-      it 'returns no slaves' do
-        assert_equal([], @throttler.send(:get_slaves))
+      it 'returns no replicas' do
+        assert_equal([], @throttler.send(:get_replicas))
       end
     end
 
-    describe 'with multiple slaves' do
+    describe 'with multiple replicas' do
       before do
-        class TestSlave
+        class TestReplica
           attr_reader :host, :connection
 
           def initialize(host, _)
@@ -259,7 +251,7 @@ describe Lhm::Throttler::SlaveLag do
             @connection = 'conn' if @host
           end
 
-          def slave_hosts
+          def replica_hosts
             if @host == '1.1.1.1'
               ['1.1.1.2', '1.1.1.3']
             else
@@ -268,21 +260,21 @@ describe Lhm::Throttler::SlaveLag do
           end
         end
 
-        @create_slave = lambda { |host, config|
-          TestSlave.new(host, config)
+        @create_replica = lambda { |host, config|
+          TestReplica.new(host, config)
         }
       end
 
       describe 'without the :check_only option' do
         before do
-          def @throttler.master_slave_hosts
+          def @throttler.master_replica_hosts
             ['1.1.1.1', '1.1.1.4']
           end
         end
 
-        it 'returns the slave instances' do
-          Lhm::Throttler::Slave.stubs(:new).returns(@create_slave) do
-            assert_equal(["1.1.1.4", "1.1.1.1", "1.1.1.3", "1.1.1.2"], @throttler.send(:get_slaves).map(&:host))
+        it 'returns the replica instances' do
+          Lhm::Throttler::Replica.stubs(:new).returns(@create_replica) do
+            assert_equal(["1.1.1.4", "1.1.1.1", "1.1.1.3", "1.1.1.2"], @throttler.send(:get_replicas).map(&:host))
           end
         end
       end
@@ -291,28 +283,28 @@ describe Lhm::Throttler::SlaveLag do
         describe 'with a callable argument' do
           before do
             check_only = lambda { { 'host' => '1.1.1.3' } }
-            @throttler = Lhm::Throttler::SlaveLag.new :check_only => check_only
+            @throttler = Lhm::Throttler::ReplicaLag.new :check_only => check_only
           end
 
-          it 'returns only that single slave' do
-            Lhm::Throttler::Slave.stubs(:new).returns(@create_slave) do
-              assert_equal ['1.1.1.3'], @throttler.send(:get_slaves).map(&:host)
+          it 'returns only that single replica' do
+            Lhm::Throttler::Replica.stubs(:new).returns(@create_replica) do
+              assert_equal ['1.1.1.3'], @throttler.send(:get_replicas).map(&:host)
             end
           end
         end
 
         describe 'with a non-callable argument' do
           before do
-            @throttler = Lhm::Throttler::SlaveLag.new :check_only => 'I cannot be called'
+            @throttler = Lhm::Throttler::ReplicaLag.new :check_only => 'I cannot be called'
 
-            def @throttler.master_slave_hosts
+            def @throttler.master_replica_hosts
               ['1.1.1.1', '1.1.1.4']
             end
           end
 
-          it 'returns all the slave instances' do
-            Lhm::Throttler::Slave.stubs(:new).returns(@create_slave) do
-              assert_equal(["1.1.1.4", "1.1.1.1", "1.1.1.3", "1.1.1.2"], @throttler.send(:get_slaves).map(&:host))
+          it 'returns all the replica instances' do
+            Lhm::Throttler::Replica.stubs(:new).returns(@create_replica) do
+              assert_equal(["1.1.1.4", "1.1.1.1", "1.1.1.3", "1.1.1.2"], @throttler.send(:get_replicas).map(&:host))
             end
           end
         end

data/spec/unit/throttler/threads_running_spec.rb

@@ -9,6 +9,24 @@ describe Lhm::Throttler::ThreadsRunning do
     @throttler = Lhm::Throttler::ThreadsRunning.new
   end
 
+  describe '#stride' do
+    describe 'default value' do
+      it 'is present' do
+        assert_equal(@throttler.stride, 2_000)
+      end
+    end
+
+    describe 'when set by user' do
+      before do
+        @throttler = Lhm::Throttler::ThreadsRunning.new(stride: 100_500)
+      end
+
+      it 'returns that value' do
+        assert_equal(@throttler.stride, 100_500)
+      end
+    end
+  end
+
   describe '#throttle_seconds' do
     describe 'with no mysql activity' do
       before do

data/spec/unit/throttler_spec.rb

@@ -31,13 +31,13 @@ describe Lhm::Throttler do
       end
     end
 
-    describe 'when passing a slave_lag_throttler key' do
+    describe 'when passing a replica_lag_throttler key' do
       before do
-        @mock.setup_throttler(:slave_lag_throttler, allowed_lag: 20)
+        @mock.setup_throttler(:replica_lag_throttler, allowed_lag: 20)
       end
 
-      it 'instantiates the slave_lag throttle' do
-        value(@mock.throttler.class).must_equal Lhm::Throttler::SlaveLag
+      it 'instantiates the replica_lag throttle' do
+        value(@mock.throttler.class).must_equal Lhm::Throttler::ReplicaLag
       end
 
       it 'returns 20 seconds as allowed_lag' do
@@ -66,10 +66,10 @@ describe Lhm::Throttler do
       end
     end
 
-    describe 'when passing a slave_lag_throttler instance' do
+    describe 'when passing a replica_lag_throttler instance' do
 
       before do
-        @instance = Lhm::Throttler::SlaveLag.new
+        @instance = Lhm::Throttler::ReplicaLag.new
         def @instance.timeout_seconds
           0
         end
@@ -98,10 +98,10 @@ describe Lhm::Throttler do
       end
     end
 
-    describe 'when passing a slave_lag_throttler class' do
+    describe 'when passing a replica_lag_throttler class' do
 
       before do
-        @klass = Class.new(Lhm::Throttler::SlaveLag)
+        @klass = Class.new(Lhm::Throttler::ReplicaLag)
         @mock.setup_throttler(@klass)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhm-shopify
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 4.1.0
 platform: ruby
 authors:
 - SoundCloud
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
@@ -112,6 +112,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: trilogy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +193,6 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -188,15 +201,15 @@ files:
 - README.md
 - Rakefile
 - dev.yml
+- docker-compose-mysql-5.7.yml
+- docker-compose-mysql-8.0.yml
 - docker-compose.yml
-- gemfiles/activerecord_5.2.gemfile
-- gemfiles/activerecord_5.2.gemfile.lock
-- gemfiles/activerecord_6.0.gemfile
-- gemfiles/activerecord_6.0.gemfile.lock
 - gemfiles/activerecord_6.1.gemfile
 - gemfiles/activerecord_6.1.gemfile.lock
-- gemfiles/activerecord_7.0.0.alpha2.gemfile
-- gemfiles/activerecord_7.0.0.alpha2.gemfile.lock
+- gemfiles/activerecord_7.0.gemfile
+- gemfiles/activerecord_7.0.gemfile.lock
+- gemfiles/activerecord_7.1.gemfile
+- gemfiles/activerecord_7.1.gemfile.lock
 - lhm.gemspec
 - lib/lhm-shopify.rb
 - lib/lhm.rb
@@ -222,6 +235,7 @@ files:
 - lib/lhm/table_name.rb
 - lib/lhm/test_support.rb
 - lib/lhm/throttler.rb
+- lib/lhm/throttler/replica_lag.rb
 - lib/lhm/throttler/slave_lag.rb
 - lib/lhm/throttler/threads_running.rb
 - lib/lhm/throttler/time.rb
@@ -282,7 +296,7 @@ files:
 - spec/unit/sql_helper_spec.rb
 - spec/unit/table_name_spec.rb
 - spec/unit/table_spec.rb
-- spec/unit/throttler/slave_lag_spec.rb
+- spec/unit/throttler/replica_lag_spec.rb
 - spec/unit/throttler/threads_running_spec.rb
 - spec/unit/throttler_spec.rb
 - spec/unit/unit_helper.rb
@@ -299,14 +313,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.4.20
 signing_key: 
 specification_version: 4
 summary: online schema changer for mysql

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-before_script:
-  - "mysql -e 'create database lhm;'"
-rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-sudo: false
-gemfile:
-  - gemfiles/ar-2.3_mysql.gemfile
-  - gemfiles/ar-3.2_mysql.gemfile
-  - gemfiles/ar-3.2_mysql2.gemfile
-  - gemfiles/ar-4.0_mysql2.gemfile
-  - gemfiles/ar-4.1_mysql2.gemfile
-  - gemfiles/ar-4.2_mysql2.gemfile
-matrix:
-  exclude:
-    - rvm: 2.2
-      gemfile: gemfiles/ar-3.2_mysql.gemfile
-    - rvm: 2.2
-      gemfile: gemfiles/ar-2.3_mysql.gemfile

data/gemfiles/activerecord_5.2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "5.2.6"
-gem "simplecov", "0.18.5"
-gem "docile", "1.3.5"
-
-gemspec path: "../"

data/gemfiles/activerecord_5.2.gemfile.lock

@@ -1,65 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    lhm-shopify (3.5.5)
-      retriable (>= 3.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
-    activesupport (5.2.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    after_do (0.4.0)
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (9.0.0)
-    byebug (11.1.3)
-    concurrent-ruby (1.1.9)
-    docile (1.3.5)
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    mocha (1.13.0)
-    mysql2 (0.5.3)
-    rake (13.0.6)
-    retriable (3.1.2)
-    simplecov (0.18.5)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.3)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    toxiproxy (2.0.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  x86_64-darwin-20
-
-DEPENDENCIES
-  activerecord (= 5.2.6)
-  after_do
-  appraisal
-  byebug
-  docile (= 1.3.5)
-  lhm-shopify!
-  minitest
-  mocha
-  mysql2
-  rake
-  simplecov (= 0.18.5)
-  toxiproxy
-
-BUNDLED WITH
-   2.2.22