ar_mysql_flexmaster 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d979b832a9129feb067d6993efc2ac5fc58ae92
-  data.tar.gz: 600daab5842bf3edebc12e17ede751032b3c3c53
+  metadata.gz: 2b32c2b9162fc4959df4858f60552cbfd4fbfdff
+  data.tar.gz: 1e5f07d3984485add95bb95af4b8e690660746c5
 SHA512:
-  metadata.gz: 20975216d3400b8755321d8e9de0f506e3a661de0e698fb9e89f54ec647017700c9596b3f341a0acd7b059d4721d10b129b4af3439b5c9ff3eece408f6ea153b
-  data.tar.gz: eedcce97ab154e6b2886fd51cf8cda509b3e77b382ccd84df9333e66805ed3b4a2da79ed2d274f9f1c880fbf69700fbec842719d34eaa749fd19f4d3f8e7c211
+  metadata.gz: fc8509dfa2ab7a83421f483a68c533e41804519ad93f4e07dd89f98a0b5e4d5f4958faae57f159235c3c4201dc4f542bfd58d6411894b3522e4108124d48f4a8
+  data.tar.gz: 1f4328dec6136634e150ed7fdc47e907fc91a7b463d1ab42a568aee67ec1644cc844fdc7f6ae83c912052a364d90b63313e6913303a9ff799cfe561f9cdf404b

data/ar_mysql_flexmaster.gemspec

@@ -12,13 +12,15 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "ar_mysql_flexmaster"
   gem.require_paths = ["lib"]
-  gem.version       = "0.6.0"
+  gem.version       = "1.0.0"
 
   gem.add_runtime_dependency("mysql2")
   gem.add_runtime_dependency("activerecord")
   gem.add_runtime_dependency("activesupport")
   gem.add_development_dependency("wwtd")
   gem.add_development_dependency("minitest")
+  gem.add_development_dependency("mocha", "~> 1.1.0")
   gem.add_development_dependency("bump")
+  gem.add_development_dependency("pry")
   gem.add_development_dependency("mysql_isolated_server", "~> 0.5")
 end

data/bin/master_cut

@@ -35,8 +35,8 @@ def usage
 end
 
 $old_master, $new_master, $username = *ARGV
-unless $old_master && $new_master && $username 
-  usage 
+unless $old_master && $new_master && $username
+  usage
 end
 
 
@@ -47,11 +47,11 @@ def open_cx(host)
 end
 
 def set_rw(cx)
-  cx.query("SET GLOBAL READ_ONLY=0")  
+  cx.query("SET GLOBAL READ_ONLY=0")
 end
 
 def set_ro(cx)
-  cx.query("SET GLOBAL READ_ONLY=1")  
+  cx.query("SET GLOBAL READ_ONLY=1")
 end
 
 $swapped_ok = false
@@ -85,20 +85,20 @@ def preflight_check
   slave_info = slave_cx.query("show slave status").first
   fail("no slave configured!") if slave_info.nil?
   fail("slave is stopped!") unless slave_info['Slave_IO_Running'] == 'Yes' && slave_info['Slave_SQL_Running'] == 'Yes'
-  fail("slave is delayed") if slave_info['Seconds_Behind_Master'].nil? || slave_info['Seconds_Behind_Master'] > 0  
+  fail("slave is delayed") if slave_info['Seconds_Behind_Master'].nil? || slave_info['Seconds_Behind_Master'] > 0
 
   masters_slave_info = cx.query("show slave status").first
   if $rehome_master && (masters_slave_info.nil? || masters_slave_info['Master_User'] == 'test')
     fail("I can't rehome the original master -- it has no slave user or password.")
   end
- 
+
   master_ip, slave_master_ip = [$old_master, slave_info['Master_Host']].map do |h|
     h = h.split(':').first
-    Socket.gethostbyname(h)[3].unpack("CCCC") 
+    Socket.gethostbyname(h)[3].unpack("CCCC")
   end
 
   if master_ip != slave_master_ip
-    fail("slave does not appear to be replicating off master! (master: #{master_ip.join('.')}, slave's master: #{slave_master_ip.join('.')})") 
+    fail("slave does not appear to be replicating off master! (master: #{master_ip.join('.')}, slave's master: #{slave_master_ip.join('.')})")
   end
 end
 
@@ -122,24 +122,24 @@ end
 
 def kill_query!(cx, id)
   begin
-    cx.query("kill #{id}") 
+    cx.query("kill #{id}")
   rescue Mysql2::Error => e
     raise e unless e.errno == 1094 # unknown thread id error
   end
 end
 
 def swap_thread
-  Thread.new do 
+  Thread.new do
     master = open_cx($old_master)
     slave = open_cx($new_master)
     set_ro(master)
-    slave.query("slave stop")
+    slave.query("STOP SLAVE")
     new_master_info = slave.query("show master status").first
     set_rw(slave)
     $swapped_ok = true
     puts "Swapped #{$old_master} and #{$new_master}"
     puts "New master information at time of swap: "
-    pp new_master_info 
+    pp new_master_info
     if $rehome_master
       rehome_master(new_master_info, $start_slave)
     end
@@ -153,18 +153,15 @@ def rehome_master(info, start_slave)
   port_clause = port ? "master_port = #{port}," : ""
   cx = open_cx($old_master)
   cx.query("change master to master_host='#{host}', #{port_clause} master_log_file = '#{info['File']}', master_log_pos=#{info['Position']}")
-  cx.query("slave start") if start_slave
+  cx.query("START SLAVE") if start_slave
 end
 
 ask_for_password
 preflight_check
 
 threads = []
-threads << process_kill_thread
 threads << swap_thread
+threads << process_kill_thread
 threads.each(&:join)
 
 rehome_master
-
-
-

data/test/ar_flexmaster_test.rb

@@ -2,6 +2,7 @@ require 'bundler/setup'
 require 'ar_mysql_flexmaster'
 require 'active_record'
 require 'minitest/autorun'
+require 'mocha/mini_test'
 
 if !defined?(Minitest::Test)
   Minitest::Test = MiniTest::Unit::TestCase
@@ -286,6 +287,18 @@ class TestArFlexmaster < Minitest::Test
     $mysql_slave_2.up!
   end
 
+  def test_connection_multiple_attempts
+    # We're simulating connection timeout, so mocha's Expectation#times doesn't register the calls
+    attempts = 0
+    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 }
+    assert_raises(ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter::NoServerAvailableException) do
+      ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter.new(null_logger, config)
+    end
+    assert_equal 5, attempts
+  end
 
   private
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: mysql_isolated_server
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: select a master at runtime from a list