ar_mysql_flexmaster 0.1.3 → 0.2.0

data/Rakefile

@@ -6,11 +6,16 @@ require 'yaggy'
 
 Yaggy.gem(File.expand_path("ar_mysql_flexmaster.gemspec", File.dirname(__FILE__)), :push_gem => true)
 
-Rake::TestTask.new(:test) do |test|
+Rake::TestTask.new(:test_units) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/*_test.rb'
-  #test.test_files = ['test/integration/run_integration_tests']
   test.verbose = true
 end
 
+task :test do 
+  retval = true
+  retval &= Rake::Task[:test_units].invoke
+  retval &= system(File.dirname(__FILE__) + "/test/integration/run_integration_tests")
+end
+
 task :default => :test

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

data/lib/active_record/connection_adapters/mysql_flexmaster_adapter.rb

@@ -94,23 +94,30 @@ module ActiveRecord
       def find_correct_host
         cxs = hosts_and_ports.map do |host, port|
           initialize_connection(host, port)
-        end
+        end.compact
 
-        correct_cxs = cxs.select { |cx| cx && cx_correct?(cx) }
+        correct_cxs = cxs.select { |cx| cx_correct?(cx) }
 
+        chosen_cx = nil
         if @is_master
           # for master connections, we make damn sure that we have just one master
           if correct_cxs.size == 1
-            return correct_cxs.first
+            chosen_cx = correct_cxs.first
           else
             # nothing read-write, or too many read-write
             # (should we manually close the connections?)
-            return nil
+            chosen_cx = nil
           end
         else
-          # for slave connections, we just return a random RO candidate
-          return correct_cxs.shuffle.first
+          # for slave connections, we just return a random RO candidate or the master if none are available
+          if correct_cxs.empty?
+            chosen_cx = cxs.first
+          else
+            chosen_cx = correct_cxs.shuffle.first
+          end
         end
+        cxs.each { |cx| cx.close unless chosen_cx == cx }
+        chosen_cx
       end
 
       def initialize_connection(host, port)

data/test/ar_flexmaster_test.rb

@@ -3,6 +3,7 @@ require 'ar_mysql_flexmaster'
 require 'active_record'
 require_relative 'boot_mysql_env'
 require 'test/unit'
+require 'debugger'
 
 File.open(File.dirname(File.expand_path(__FILE__)) + "/database.yml", "w+") do |f|
       f.write <<-EOL
@@ -17,7 +18,7 @@ test_slave:
   adapter: mysql_flexmaster
   username: flex
   slave: true
-  hosts: ["127.0.0.1:#{$mysql_slave.port}", "127.0.0.1:#{$mysql_slave_2.port}"]
+  hosts: ["127.0.0.1:#{$mysql_master.port}", "127.0.0.1:#{$mysql_slave.port}", "127.0.0.1:#{$mysql_slave_2.port}"]
   password:
   database: flexmaster_test
       EOL
@@ -57,7 +58,7 @@ class TestArFlexmaster < Test::Unit::TestCase
   end
 
   def test_should_select_the_master_on_boot
-    assert main_connection_is_master?
+    assert main_connection_is_original_master?
   end
 
   def test_should_hold_txs_until_timeout_then_abort
@@ -80,7 +81,7 @@ class TestArFlexmaster < Test::Unit::TestCase
       $mysql_slave.set_rw(true)
     end
     User.create(:name => "foo")
-    assert !main_connection_is_master?
+    assert !main_connection_is_original_master?
     assert User.first(:conditions => {:name => "foo"})
   end
 
@@ -92,7 +93,7 @@ class TestArFlexmaster < Test::Unit::TestCase
       $mysql_slave.set_rw(true)
     end
     User.update_all(:name => "bar")
-    assert !main_connection_is_master?
+    assert !main_connection_is_original_master?
     assert_equal "bar", User.first.name
   end
 
@@ -109,11 +110,11 @@ class TestArFlexmaster < Test::Unit::TestCase
     ActiveRecord::Base.connection
     $mysql_master.set_rw(false)
     $mysql_slave.set_rw(true)
-    assert main_connection_is_master?
+    assert main_connection_is_original_master?
     100.times do
       u = User.first
     end
-    assert !main_connection_is_master?
+    assert !main_connection_is_original_master?
   end
 
   def test_should_choose_a_random_slave_connection
@@ -131,10 +132,11 @@ class TestArFlexmaster < Test::Unit::TestCase
     User.create!
     $mysql_master.set_rw(false)
     $mysql_slave.set_rw(true)
-    11.times do
-      UserSlave.first
+    20.times do
+      UserSlave.connection.execute("select 1")
     end
-    assert_equal $mysql_slave_2.port, port_for_class(UserSlave)
+    connected_port = port_for_class(UserSlave)
+    assert [$mysql_slave_2.port, $mysql_master.port].include?(connected_port)
   end
 
   def test_xxx_non_responsive_master
@@ -149,20 +151,31 @@ class TestArFlexmaster < Test::Unit::TestCase
   def test_yyy_shooting_the_master_in_the_head
     User.create!
     Process.kill("TERM", $mysql_master.pid)
+    sleep 1
     $mysql_slave.set_rw(true)
     User.connection.reconnect!
     User.create!
     UserSlave.first
-    assert !main_connection_is_master?
+    assert !main_connection_is_original_master?
   end
 
+  # test that when nothing else is available we can fall back to the master in a slave role
+  # 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!
+    UserSlave.connection.reconnect!
+    assert port_for_class(UserSlave) == $mysql_slave.port
+  end
+
+
   private
 
   def port_for_class(klass)
     klass.connection.execute("show global variables like 'port'").first.last.to_i
   end
 
-  def main_connection_is_master?
+  def main_connection_is_original_master?
     port = port_for_class(ActiveRecord::Base)
     port == $mysql_master.port
   end

data/test/boot_mysql_env.rb

@@ -2,33 +2,39 @@
 
 require_relative "mysql_isolated_server"
 
-mysql_master = MysqlIsolatedServer.new(allow_output: false)
-mysql_master.boot!
-mysql_master.connection.query("set global server_id=1")
+threads = []
+threads << Thread.new do
+  $mysql_master = MysqlIsolatedServer.new(allow_output: false)
+  $mysql_master.boot!
+  $mysql_master.connection.query("set global server_id=1")
 
-puts "mysql master booted on port #{mysql_master.port} -- access with mysql -uroot -h127.0.0.1 --port=#{mysql_master.port} mysql"
+  puts "mysql master booted on port #{$mysql_master.port} -- access with mysql -uroot -h127.0.0.1 --port=#{$mysql_master.port} mysql"
+end
 
-mysql_slave = MysqlIsolatedServer.new
-mysql_slave.boot!
-mysql_slave.connection.query("set global server_id=2")
+threads << Thread.new do
+  $mysql_slave = MysqlIsolatedServer.new
+  $mysql_slave.boot!
+  $mysql_slave.connection.query("set global server_id=2")
 
-puts "mysql slave booted on port #{mysql_slave.port} -- access with mysql -uroot -h127.0.0.1 --port=#{mysql_slave.port} mysql"
+  puts "mysql slave booted on port #{$mysql_slave.port} -- access with mysql -uroot -h127.0.0.1 --port=#{$mysql_slave.port} mysql"
+end
 
-mysql_slave_2 = MysqlIsolatedServer.new
-mysql_slave_2.boot!
-mysql_slave_2.connection.query("set global server_id=3")
+threads << Thread.new do
+  $mysql_slave_2 = MysqlIsolatedServer.new
+  $mysql_slave_2.boot!
+  $mysql_slave_2.connection.query("set global server_id=3")
 
-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"
+  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"
+end
 
-mysql_master.connection.query("CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_password=''")
-mysql_slave.make_slave_of(mysql_master)
-mysql_slave_2.make_slave_of(mysql_slave)
+threads.each(&:join)
 
-mysql_master.connection.query("GRANT ALL ON flexmaster_test.* to flex@localhost")
-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_master.connection.query("CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_password=''")
+$mysql_slave.make_slave_of($mysql_master)
+$mysql_slave_2.make_slave_of($mysql_slave)
+
+$mysql_master.connection.query("GRANT ALL ON flexmaster_test.* to flex@localhost")
+$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_master = mysql_master
-$mysql_slave = mysql_slave
-$mysql_slave_2 = mysql_slave_2

data/test/integration/run_integration_tests

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+retval = true
+Dir.glob(File.dirname(__FILE__) + '/*_test.rb').each do |f|
+  retval &= system("ruby #{f}")
+end
+exit retval

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -120,6 +120,7 @@ files:
 - test/boot_mysql_env.rb
 - test/boot_slave
 - test/integration/no_traffic_test.rb
+- test/integration/run_integration_tests
 - test/integration/there_and_back_again_test.rb
 - test/integration/with_queries_to_be_killed_test.rb
 - test/integration/wrong_setup_test.rb
@@ -141,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1413669962655768174
+      hash: 3291849220981304751
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1413669962655768174
+      hash: 3291849220981304751
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -162,6 +163,7 @@ test_files:
 - test/boot_mysql_env.rb
 - test/boot_slave
 - test/integration/no_traffic_test.rb
+- test/integration/run_integration_tests
 - test/integration/there_and_back_again_test.rb
 - test/integration/with_queries_to_be_killed_test.rb
 - test/integration/wrong_setup_test.rb