ar_mysql_flexmaster 0.4.2 → 0.4.3

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

data/lib/active_record/connection_adapters/mysql_flexmaster_adapter.rb

@@ -68,6 +68,15 @@ module ActiveRecord
         end
       end
 
+      # after a cluster recovers from a bad state, an insert or SELECT will bring us back
+      # into sanity, but sometimes would we never get there and would get stuck crashing in this function instead.
+      def quote(*args)
+        if !@connection
+          soft_verify
+        end
+        super
+      end
+
       def current_host
         @connection.query_options[:host]
       end

data/test/ar_flexmaster_test.rb

@@ -191,25 +191,52 @@ class TestArFlexmaster < Test::Unit::TestCase
     ActiveRecord::Base.configurations["test"]["hosts"].pop
   end
 
-  def test_shooting_the_master_in_the_head
+  def test_limping_along_with_a_slave_acting_as_a_master
     User.create!
-    UserSlave.first
-
     $mysql_master.down!
 
-    # protected against 'gone away' errors?
-    assert User.first
+    # the test here is that even though we've asserted we want the master,
+    # since we're doing a SELECT we'll stay limping along by running the SELECT on a slave instead.
+    User.first
+
+    assert [$mysql_slave, $mysql_slave_2].include?(master_connection)
+  ensure
+    $mysql_master.up!
+  end
+
+  def test_recovering_after_losing_connection_to_the_master
+    User.create!
+    assert User.connection.instance_variable_get("@connection")
 
-    # this statement should
-    # put us into a bad state -- our @connection should be nil, as we'll fail to get a master connection
+    $mysql_master.down!
+    # trying to do an INSERT with the master down puts is into a precious state --
+    # we've got a nil @connection object.  There's two possible solutions here;
+    #
+    # 1 - substitute a slave connection in for the master object but raise an exception anyway
+    # 2 - deal with a nil connection object later
+    #
+    # opting for (2) now
+    #
     assert_raises(ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter::NoServerAvailableException) do
       User.create!
     end
 
-    # now test that the next time through we ask for a read connection, we'll grudgingly give back the slave
-    User.first
+    assert_equal nil, User.connection.instance_variable_get("@connection")
 
-    assert [$mysql_slave, $mysql_slave_2].include?(master_connection)
+    # this proxies to @connection and has been the cause of some crashes
+    assert User.connection.quote("foo")
+  ensure
+    $mysql_master.up!
+  end
+
+  def test_recovering_after_the_master_is_back_up
+    User.create!
+    $mysql_master.down!
+
+    assert_raises(ActiveRecord::ConnectionAdapters::MysqlFlexmasterAdapter::NoServerAvailableException) do
+      User.create!
+    end
+    # bad state again.
 
     # now a dba or someone comes along and flips the read-only bit on the slave
     $mysql_slave.set_rw(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors: