ar_mysql_flexmaster 0.2.1 → 0.2.2

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.1"
+  gem.version       = "0.2.2"
 
   gem.add_runtime_dependency("mysql2")
   gem.add_runtime_dependency("activerecord")

data/lib/active_record/connection_adapters/mysql_flexmaster_adapter.rb

@@ -25,6 +25,8 @@ module ActiveRecord
   module ConnectionAdapters
     class MysqlFlexmasterAdapter < Mysql2Adapter
       class NoActiveMasterException < Exception; end
+      class TooManyMastersException < Exception; end
+      class NoServerAvailableException < Exception; end
 
       CHECK_EVERY_N_SELECTS = 10
       DEFAULT_CONNECT_TIMEOUT = 5
@@ -36,8 +38,10 @@ module ActiveRecord
         @is_master = !config[:slave]
         @tx_hold_timeout = @config[:tx_hold_timeout] || DEFAULT_TX_HOLD_TIMEOUT
         @connection_timeout = @config[:connection_timeout] || DEFAULT_CONNECT_TIMEOUT
+
         connection = find_correct_host
-        raise NoActiveMasterException unless connection
+
+        raise_no_server_available! unless connection
         super(connection, logger, [], config)
       end
 
@@ -69,7 +73,26 @@ module ActiveRecord
         raise NoActiveMasterException unless @connection
       end
 
+      def raise_no_server_available!
+        raise NoServerAvailableException.new(errors_to_message)
+      end
+
+      def collected_errors
+        @collected_errors ||= []
+      end
+
+      def clear_collected_errors!
+        @collected_errors = []
+      end
+
+      def errors_to_message
+        "Errors encountered while trying #{@config[:hosts].inspect}: " +
+          collected_errors.map { |e| "#{e.class.name}: #{e.message}" }.uniq.join(",")
+      end
+
       def refind_correct_host(tries = nil, sleep_interval = nil)
+        clear_collected_errors!
+
         tries ||= @tx_hold_timeout.to_f / 0.1
         sleep_interval ||= 0.1
         tries.to_i.times do
@@ -80,7 +103,7 @@ module ActiveRecord
           end
           sleep(sleep_interval)
         end
-        raise NoActiveMasterException
+        raise_no_server_available!
       end
 
       def hosts_and_ports
@@ -106,6 +129,12 @@ module ActiveRecord
           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
+              collected_errors << NoActiveMasterException.new("no read-write servers found")
+            end
+
             chosen_cx = nil
           end
         else
@@ -128,8 +157,12 @@ module ActiveRecord
               cx.query_options.merge!(:as => :array)
             end
           end
-        rescue Mysql2::Error
-        rescue Timeout::Error
+        rescue Mysql2::Error => e
+          collected_errors << e
+          nil
+        rescue Timeout::Error => e
+          collected_errors << e
+          nil
         end
       end
 

data/test/ar_flexmaster_test.rb

@@ -38,13 +38,15 @@ end
 # $mysql_master and $mysql_slave are separate references to the master and slave that we
 # use to send control-channel commands on
 
+$original_master_port = $mysql_master.port
+
 class TestArFlexmaster < Test::Unit::TestCase
   def setup
     ActiveRecord::Base.establish_connection("test")
 
-    $mysql_master.set_rw(true)
-    $mysql_slave.set_rw(false)
-    $mysql_slave_2.set_rw(false)
+    $mysql_master.set_rw(true) if $mysql_master
+    $mysql_slave.set_rw(false) if $mysql_slave
+    $mysql_slave_2.set_rw(false) if $mysql_slave_2
   end
 
   def test_should_raise_without_a_rw_master
@@ -52,9 +54,11 @@ class TestArFlexmaster < Test::Unit::TestCase
       m.set_rw(false)
     end
 
-    assert_raises(ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter::NoActiveMasterException) do
+    e = assert_raises(ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter::NoServerAvailableException) do
       ActiveRecord::Base.connection
     end
+
+    assert e.message =~ /NoActiveMasterException/
   end
 
   def test_should_select_the_master_on_boot
@@ -66,7 +70,7 @@ class TestArFlexmaster < Test::Unit::TestCase
 
     $mysql_master.set_rw(false)
     start_time = Time.now.to_i
-    assert_raises(ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter::NoActiveMasterException) do
+    e = assert_raises(ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter::NoServerAvailableException) do
       User.create(:name => "foo")
     end
     end_time = Time.now.to_i
@@ -150,7 +154,10 @@ class TestArFlexmaster < Test::Unit::TestCase
 
   def test_yyy_shooting_the_master_in_the_head
     User.create!
-    Process.kill("TERM", $mysql_master.pid)
+
+    $mysql_master.kill!
+    $mysql_master = nil
+
     sleep 1
     $mysql_slave.set_rw(true)
     User.connection.reconnect!
@@ -163,7 +170,10 @@ class TestArFlexmaster < Test::Unit::TestCase
   # note that by the time this test runs, the 'yyy' test has already killed the master
   def test_zzz_shooting_the_other_slave_in_the_head
     $mysql_slave.set_rw(true)
+
     $mysql_slave_2.kill!
+    $mysql_slave_2 = nil
+
     UserSlave.connection.reconnect!
     assert port_for_class(UserSlave) == $mysql_slave.port
   end
@@ -177,6 +187,6 @@ class TestArFlexmaster < Test::Unit::TestCase
 
   def main_connection_is_original_master?
     port = port_for_class(ActiveRecord::Base)
-    port == $mysql_master.port
+    port == $original_master_port
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -140,18 +140,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -961261778755012131
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -961261778755012131
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24