ar_mysql_flexmaster 1.0.2 → 1.0.3

data/lib/active_record/connection_adapters/mysql_flexmaster_adapter.rb

@@ -10,9 +10,6 @@ module ActiveRecord
 
       # fallback to :host or :localhost
       config[:hosts] ||= config.key?(:host) ? [config[:host]] : ['localhost']
-
-      hosts = config[:hosts] || [config[:host]]
-
       config[:username] = 'root' if config[:username].nil?
 
       if Mysql2::Client.const_defined? :FOUND_ROWS
@@ -119,13 +116,16 @@ module ActiveRecord
         end
       end
 
-      AR_MESSAGES = [ /^Mysql2::Error: MySQL server has gone away/,
-                      /^Mysql2::Error: Can't connect to MySQL server/ ]
+      AR_MESSAGES = [/^Mysql2::Error: MySQL server has gone away/,
+                     /^Mysql2::Error: Lost connection to MySQL server during query/,
+                     /^Mysql2::Error: Can't connect to MySQL server/]
       def retryable_error?(e)
         case e
         when Mysql2::Error
-          # 2006 is gone-away, 2003 is can't-connect (applicable when reconnect is true)
-          [2006, 2003].include?(e.errno)
+          # 2006 is gone-away
+          # 2013 is lost connection during query
+          # 2003 is can't-connect (applicable when reconnect is true)
+          [2006, 2013, 2003].include?(e.errno)
         when ActiveRecord::StatementInvalid
           AR_MESSAGES.any? { |m| e.message.match(m) }
         end
@@ -194,12 +194,14 @@ module ActiveRecord
         sleep_interval = 0.1
         timeout_at = Time.now.to_f + @tx_hold_timeout
 
-        begin
+        loop do
           @connection = find_correct_host(@rw)
           return if @connection
 
           sleep(sleep_interval)
-        end while Time.now.to_f < timeout_at
+
+          break unless Time.now.to_f < timeout_at
+        end
 
         raise_no_server_available!
       end
@@ -250,7 +252,7 @@ module ActiveRecord
       def initialize_connection(host, port)
         attempts = 1
         begin
-          Timeout::timeout(@connection_timeout) do
+          Timeout.timeout(@connection_timeout) do
             cfg = @config.merge(:host => host, :port => port)
             Mysql2::Client.new(cfg).tap do |cx|
               cx.query_options.merge!(:as => :array)

data/test/ar_flexmaster_test.rb

@@ -13,7 +13,7 @@ end
 require_relative 'boot_mysql_env'
 
 File.open(File.dirname(File.expand_path(__FILE__)) + "/database.yml", "w+") do |f|
-      f.write <<-EOL
+  f.write <<-EOL
 common: &common
   adapter: mysql_flexmaster
   username: flex
@@ -38,7 +38,7 @@ reconnect_slave:
       EOL
 end
 
-ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+ActiveRecord::Base.configurations = YAML.load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.establish_connection(:test)
 
 class User < ActiveRecord::Base
@@ -94,7 +94,7 @@ class TestArFlexmaster < Minitest::Test
 
     $mysql_master.set_rw(false)
     start_time = Time.now.to_i
-    e = assert_raises(ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter::NoServerAvailableException) do
+    assert_raises(ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter::NoServerAvailableException) do
       User.create(:name => "foo")
     end
     end_time = Time.now.to_i
@@ -113,7 +113,7 @@ class TestArFlexmaster < Minitest::Test
     if ActiveRecord::VERSION::MAJOR >= 4
       assert User.where(:name => "foo").exists?
     else
-      assert User.first(:conditions => {:name => "foo"})
+      assert User.first(:conditions => { :name => "foo" })
     end
   end
 
@@ -146,7 +146,7 @@ class TestArFlexmaster < Minitest::Test
     $mysql_slave.set_rw(true)
     assert_equal $mysql_master, master_connection
     100.times do
-      u = User.first
+      User.first
     end
     assert_equal $mysql_slave, master_connection
   end
@@ -159,7 +159,7 @@ class TestArFlexmaster < Minitest::Test
     $mysql_slave.set_rw(false)
     assert_equal $mysql_master, master_connection
     100.times do
-      u = User.first
+      User.first
     end
   end
 
@@ -295,7 +295,10 @@ class TestArFlexmaster < Minitest::Test
     null_logger = Logger.new('/dev/null')
     config = { hosts: ['localhost'], connection_timeout: 0.01, connection_attempts: 5 }
 
-    Mysql2::Client.stubs(:new).with { attempts += 1; sleep 1 }
+    Mysql2::Client.stubs(:new).with do
+      attempts += 1
+      sleep 1
+    end
     assert_raises(ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter::NoServerAvailableException) do
       ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter.new(null_logger, config)
     end

data/test/boot_mysql_env.rb

@@ -1,25 +1,25 @@
-# frozen_string_literal: true
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "mysql_isolated_server"
+require "isolated_server"
 
 threads = []
 threads << Thread.new do
-  $mysql_master = MysqlIsolatedServer.new(allow_output: false)
+  $mysql_master = IsolatedServer::Mysql.new(allow_output: false)
   $mysql_master.boot!
 
   puts "mysql master booted on port #{$mysql_master.port} -- access with mysql -uroot -h127.0.0.1 --port=#{$mysql_master.port} mysql"
 end
 
 threads << Thread.new do
-  $mysql_slave = MysqlIsolatedServer.new
+  $mysql_slave = IsolatedServer::Mysql.new
   $mysql_slave.boot!
 
   puts "mysql slave booted on port #{$mysql_slave.port} -- access with mysql -uroot -h127.0.0.1 --port=#{$mysql_slave.port} mysql"
 end
 
 threads << Thread.new do
-  $mysql_slave_2 = MysqlIsolatedServer.new
+  $mysql_slave_2 = IsolatedServer::Mysql.new
   $mysql_slave_2.boot!
 
   puts "mysql chained slave booted on port #{$mysql_slave_2.port} -- access with mysql -uroot -h127.0.0.1 --port=#{$mysql_slave_2.port} mysql"

data/test/boot_slave

@@ -1,16 +1,16 @@
-require_relative 'mysql_isolated_server'
+require_relative 'isolated_server'
 
 # yeah, not technically isolated
-master = MysqlIsolatedServer.new(port: 3306)
+master = IsolatedServer::Mysql.new(port: 3306)
 
-slave = MysqlIsolatedServer.new(data_path: "/Users/ben/.zendesk/var/mysql", allow_output: true, params: "--relay-log=footwa --skip-slave-start", port: 41756)
+slave = IsolatedServer::Mysql.new(data_path: "/Users/ben/.zendesk/var/mysql", allow_output: true, params: "--relay-log=footwa --skip-slave-start", port: 41756)
 slave.boot! 
 puts "mysql slave booted on port #{slave.port} -- access with mysql -uroot -h127.0.0.1 --port=#{slave.port} mysql"
 slave.connection.query("set global server_id=123")
 slave.make_slave_of(master) 
 slave.set_rw(false)
 
-uid_server = MysqlIsolatedServer.new(data_path: "/Users/ben/.zendesk/var/mysql", allow_output: true, params: "--skip-slave-start", port: 41757)
+uid_server = IsolatedServer::Mysql.new(data_path: "/Users/ben/.zendesk/var/mysql", allow_output: true, params: "--skip-slave-start", port: 41757)
 uid_server.boot! 
 puts "mysql uid server booted on port #{uid_server.port} -- access with mysql -uroot -h127.0.0.1 --port=#{uid_server.port} mysql"
 sleep

data/test/integration/no_traffic_test.rb

@@ -13,4 +13,3 @@ class NoTrafficTest < Minitest::Test
     assert_ro($mysql_slave.connection, 'master', false)
   end
 end
-

data/test/integration/with_queries_to_be_killed_test.rb

@@ -12,7 +12,7 @@ class WithKillableQueries < Minitest::Test
         $mysql_master.connection.query("update flexmaster_test.users set name=sleep(600)")
         assert false, "Query did not get killed!  Bad."
         exit 1
-      rescue Exception => e
+      rescue StandardError => e
         puts e
       end
     }

data/test/integration/wrong_setup_test.rb

@@ -19,7 +19,7 @@ class WrongSetupTest < Minitest::Test
     puts "testing cutover with stopped slave"
     $mysql_master.connection.query("set GLOBAL READ_ONLY=0")
     $mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
-    $mysql_slave.connection.query("slave stop")
+    $mysql_slave.connection.query("STOP SLAVE")
     assert_script_failed
   end
 end

data/test/integration_helper.rb

@@ -11,10 +11,9 @@ require_relative 'boot_mysql_env'
 
 def assert_ro(cx, str, bool)
   expected = bool ? 1 : 0
-  assert_equal expected,  cx.query("select @@read_only as ro").first['ro'], "#{str} is #{bool ? 'read-write' : 'read-only'} but I expected otherwise!"
+  assert_equal expected, cx.query("select @@read_only as ro").first['ro'], "#{str} is #{bool ? 'read-write' : 'read-only'} but I expected otherwise!"
 end
 
 def master_cut_script
   File.expand_path(File.dirname(__FILE__)) + "/../bin/master_cut"
 end
-

metadata

@@ -1,14 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ben Osheroff
+- Benjamin Quorning
+- Gabe Martin-Dempesy
+- Michael Grosser
+- Pierre Schambacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -52,6 +56,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,23 +155,26 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql_isolated_server
+  name: isolated_server
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 description: ar_mysql_flexmaster allows configuring N mysql servers in database.yml
   and auto-selects which is a master at runtime
 email:
-- ben@zendesk.com
+- bquorning@zendesk.com
+- gabe@zendesk.com
+- mgrosser@zendesk.com
+- pschambacher@zendesk.com
 executables:
 - master_cut
 extensions: []
@@ -169,10 +190,6 @@ files:
 - bin/master_cut
 - gemfiles/rails3.2.gemfile
 - gemfiles/rails3.2.gemfile.lock
-- gemfiles/rails4.0.gemfile
-- gemfiles/rails4.0.gemfile.lock
-- gemfiles/rails4.1.gemfile
-- gemfiles/rails4.1.gemfile.lock
 - gemfiles/rails4.2.gemfile
 - gemfiles/rails4.2.gemfile.lock
 - gemfiles/rails5.0.gemfile
@@ -189,7 +206,7 @@ files:
 - test/integration/wrong_setup_test.rb
 - test/integration_helper.rb
 - unplanned_failovers.md
-homepage: http://github.com/osheroff/ar_mysql_flexmaster
+homepage: http://github.com/zendesk/ar_mysql_flexmaster
 licenses: []
 metadata: {}
 post_install_message: 
@@ -200,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -208,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5.3
 signing_key: 
 specification_version: 4
 summary: select a master at runtime from a list

data/gemfiles/rails4.0.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path => "../"
-
-gem "rails", "~> 4.0.0"
-gem "mysql2", "~> 0.3.0"

data/gemfiles/rails4.0.gemfile.lock

@@ -1,104 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    ar_mysql_flexmaster (0.6.0)
-      activerecord
-      activesupport
-      mysql2
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.0.13)
-      actionpack (= 4.0.13)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
-    builder (3.1.4)
-    bump (0.5.3)
-    coderay (1.1.0)
-    concurrent-ruby (1.0.0)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    mime-types (2.99)
-    minitest (4.7.5)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.11.2)
-    mysql2 (0.3.20)
-    mysql_isolated_server (0.5.3)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.0.13)
-      actionmailer (= 4.0.13)
-      actionpack (= 4.0.13)
-      activerecord (= 4.0.13)
-      activesupport (= 4.0.13)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.13)
-      sprockets-rails (~> 2.0)
-    railties (4.0.13)
-      actionpack (= 4.0.13)
-      activesupport (= 4.0.13)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    slop (3.6.0)
-    sprockets (3.5.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (0.3.46)
-    wwtd (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ar_mysql_flexmaster!
-  bump
-  minitest
-  mocha (~> 1.1.0)
-  mysql2 (~> 0.3.0)
-  mysql_isolated_server (~> 0.5)
-  pry
-  rails (~> 4.0.0)
-  rake
-  wwtd
-
-BUNDLED WITH
-   1.11.2

data/gemfiles/rails4.1.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path => "../"
-
-gem "rails", "~> 4.1.8"
-gem "mysql2", "~> 0.3.0"

data/gemfiles/rails4.1.gemfile.lock

@@ -1,109 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    ar_mysql_flexmaster (0.6.0)
-      activerecord
-      activesupport
-      mysql2
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.14)
-      actionview (= 4.1.14)
-      activesupport (= 4.1.14)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.14)
-      activesupport (= 4.1.14)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.14)
-      activesupport (= 4.1.14)
-      builder (~> 3.1)
-    activerecord (4.1.14)
-      activemodel (= 4.1.14)
-      activesupport (= 4.1.14)
-      arel (~> 5.0.0)
-    activesupport (4.1.14)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    bump (0.5.3)
-    coderay (1.1.0)
-    concurrent-ruby (1.0.0)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    mime-types (2.99)
-    minitest (5.8.3)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    mysql2 (0.3.20)
-    mysql_isolated_server (0.5.3)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.1.14)
-      actionmailer (= 4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
-      activemodel (= 4.1.14)
-      activerecord (= 4.1.14)
-      activesupport (= 4.1.14)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.14)
-      sprockets-rails (~> 2.0)
-    railties (4.1.14)
-      actionpack (= 4.1.14)
-      activesupport (= 4.1.14)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    slop (3.6.0)
-    sprockets (3.5.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    wwtd (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ar_mysql_flexmaster!
-  bump
-  minitest
-  mocha (~> 1.1.0)
-  mysql2 (~> 0.3.0)
-  mysql_isolated_server (~> 0.5)
-  pry
-  rails (~> 4.1.8)
-  rake
-  wwtd
-
-BUNDLED WITH
-   1.11.2