ar_mysql_flexmaster 0.2.2 → 0.3.0

data/ar_mysql_flexmaster.gemspec

@@ -12,7 +12,7 @@ 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.2.2"
+  gem.version       = "0.3.0"
 
   gem.add_runtime_dependency("mysql2")
   gem.add_runtime_dependency("activerecord")

data/bin/master_cut

@@ -88,7 +88,7 @@ def preflight_check
   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'
+  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
  

data/lib/active_record/connection_adapters/mysql_flexmaster_adapter.rb

@@ -47,25 +47,34 @@ module ActiveRecord
 
       def begin_db_transaction
         if !cx_correct? && open_transactions == 0
-          refind_correct_host
+          refind_correct_host!
         end
         super
       end
 
       def execute(sql, name = nil)
         if open_transactions == 0 && sql =~ /^(INSERT|UPDATE|DELETE|ALTER|CHANGE)/ && !cx_correct?
-          refind_correct_host
+          refind_correct_host!
         else
           @select_counter += 1
           if (@select_counter % CHECK_EVERY_N_SELECTS == 0) && !cx_correct?
             # on select statements, check every 10 times to see if we need to switch masters,
-            # but don't hold off anything if we fail
-            refind_correct_host(1, 0)
+            # but don't sleep, and if existing connection isn't correct, go ahead anyway.
+            cx = find_correct_host
+            @connection = cx if cx
           end
         end
         super
       end
 
+      def current_host
+        @connection.query_options[:host]
+      end
+
+      def current_port
+        @connection.query_options[:port]
+      end
+
       private
 
       def connect
@@ -90,11 +99,12 @@ module ActiveRecord
           collected_errors.map { |e| "#{e.class.name}: #{e.message}" }.uniq.join(",")
       end
 
-      def refind_correct_host(tries = nil, sleep_interval = nil)
+      def refind_correct_host!
         clear_collected_errors!
 
-        tries ||= @tx_hold_timeout.to_f / 0.1
-        sleep_interval ||= 0.1
+        sleep_interval = 0.1
+        tries = @tx_hold_timeout.to_f / sleep_interval
+
         tries.to_i.times do
           cx = find_correct_host
           if cx
@@ -128,7 +138,6 @@ module ActiveRecord
             chosen_cx = correct_cxs.first
           else
             # nothing read-write, or too many read-write
-            # (should we manually close the connections?)
             if correct_cxs.size > 1
               collected_errors << TooManyMastersException.new("found #{correct_cxs.size} read-write servers")
             else

data/test/ar_flexmaster_test.rb

@@ -121,6 +121,18 @@ class TestArFlexmaster < Test::Unit::TestCase
     assert !main_connection_is_original_master?
   end
 
+  # there's a small window in which the old master is read-only but the new slave hasn't come online yet.
+  # Allow side-effect free statements to continue.
+  def test_should_not_crash_selects_in_the_double_read_only_window
+    ActiveRecord::Base.connection
+    $mysql_master.set_rw(false)
+    $mysql_slave.set_rw(false)
+    assert main_connection_is_original_master?
+    100.times do
+      u = User.first
+    end
+  end
+
   def test_should_choose_a_random_slave_connection
     h = {}
     10.times do
@@ -131,6 +143,12 @@ class TestArFlexmaster < Test::Unit::TestCase
     assert_equal 2, h.size
   end
 
+  def test_should_expose_the_current_master_and_port
+    cx = ActiveRecord::Base.connection
+    assert_equal "127.0.0.1", cx.current_host
+    assert_equal $mysql_master.port, cx.current_port
+  end
+
   def test_should_flip_the_slave_after_it_becomes_master
     UserSlave.first
     User.create!

data/test/boot_mysql_env.rb

@@ -38,3 +38,5 @@ $mysql_master.connection.query("CREATE DATABASE flexmaster_test")
 $mysql_master.connection.query("CREATE TABLE flexmaster_test.users (id INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY, name varchar(20))")
 $mysql_master.connection.query("INSERT INTO flexmaster_test.users set name='foo'")
 
+$mysql_slave.set_rw(false)
+sleep if __FILE__ == $0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2