ar_mysql_flexmaster 0.2.0 → 0.2.1

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

data/bin/master_cut

@@ -11,6 +11,7 @@ Thread.abort_on_exception = false
 opts = GetoptLong.new(
   ["--password",      "-p", GetoptLong::REQUIRED_ARGUMENT],
   ["--rehome-master",   "-r", GetoptLong::NO_ARGUMENT],
+  ["--start-slave",   "-s", GetoptLong::NO_ARGUMENT],
 )
 
 opts.each do |opt, arg|
@@ -19,17 +20,26 @@ opts.each do |opt, arg|
     $password = arg
   when '--rehome-master'
     $rehome_master = true
+  when '--start-slave'
+    $start_slave = true
+    $rehome_master = true
   end
 end
 
-$old_master, $new_master, $username = *ARGV
-unless $old_master && $new_master && $username 
+def usage
   puts "Usage: master_cut OLD_MASTER NEW_MASTER ADMIN_USERNAME"
   puts "                  [-p,--password PASSWORD]"
-  puts "                  [-r,--reset-slave]"
-  exit
+  puts "                  [-r,--rehome-master]"
+  puts "                  [-s,--start-slave]"
+  exit false
 end
 
+$old_master, $new_master, $username = *ARGV
+unless $old_master && $new_master && $username 
+  usage 
+end
+
+
 def open_cx(host)
   host, port = host.split(":")
   port = port.to_i if port
@@ -123,19 +133,19 @@ def swap_thread
     puts "New master information at time of swap: "
     pp new_master_info 
     if $rehome_master
-      rehome_master(new_master_info)
+      rehome_master(new_master_info, $start_slave)
     end
     exit
   end
 end
 
-def rehome_master(info)
+def rehome_master(info, start_slave)
   puts "Reconfiguring #{$old_master} to be a slave of #{$new_master}..."
   host, port = $new_master.split(":")
   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")
+  cx.query("slave start") if start_slave
 end
 
 ask_for_password

data/test/integration/there_and_back_again_test.rb

@@ -1,5 +1,8 @@
 require 'bundler/setup'
 require 'mysql2'
+require 'test/unit/assertions'
+
+include Test::Unit::Assertions
 require_relative '../boot_mysql_env'
 master_cut_script = File.expand_path(File.dirname(__FILE__)) + "/../../bin/master_cut"
 
@@ -15,13 +18,17 @@ def assert_ro(cx, str, bool)
 end
 puts "testing first cutover..."
 
-system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p '' -r"
+system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p '' -r -s"
 assert_ro($mysql_master.connection, 'original master', true)
 assert_ro($mysql_slave.connection, 'original slave', false)
 
+assert "Yes" == $mysql_master.connection.query("show slave status").first['Slave_IO_Running']
+
 system "#{master_cut_script} 127.0.0.1:#{$mysql_slave.port} 127.0.0.1:#{$mysql_master.port} root -p '' -r"
 assert_ro($mysql_master.connection, 'original master', false)
 assert_ro($mysql_slave.connection, 'original slave', true)
 
+assert "No" == $mysql_slave.connection.query("show slave status").first['Slave_IO_Running']
+
 puts "everything went real nice."
 

data/test/mysql_isolated_server.rb

@@ -39,6 +39,12 @@ class MysqlIsolatedServer
   end
 
 
+  def locate_executable(*candidates)
+    output = `which #{candidates.join(' ')}`
+    return nil if output == "\n"
+    output.split("\n").first
+  end
+
   def boot!
     @port ||= grab_free_port
     system("rm -Rf #{@mysql_data_dir}")
@@ -63,10 +69,12 @@ class MysqlIsolatedServer
       sleep(0.1)
     end
 
-    system("mysql_tzinfo_to_sql /usr/share/zoneinfo 2>/dev/null | mysql --database=mysql --port=#{@port} -u root mysql >/dev/null")
+    tzinfo_to_sql = locate_executable("mysql_tzinfo_to_sql5", "mysql_tzinfo_to_sql")
+    raise "could not find mysql_tzinfo_to_sql" unless tzinfo_to_sql
+    system("#{tzinfo_to_sql} /usr/share/zoneinfo 2>/dev/null | mysql -h127.0.0.1 --database=mysql --port=#{@port} -u root mysql ")
 
-    system(%Q(mysql --port=#{@port} --database=mysql -u root -e "SET GLOBAL time_zone='UTC'"))
-    system(%Q(mysql --port=#{@port} --database=mysql -u root -e "GRANT SELECT ON *.* to 'zdslave'@'localhost'"))
+    system(%Q(mysql -h127.0.0.1 --port=#{@port} --database=mysql -u root -e "SET GLOBAL time_zone='UTC'"))
+    system(%Q(mysql -h127.0.0.1 --port=#{@port} --database=mysql -u root -e "GRANT SELECT ON *.* to 'zdslave'@'localhost'"))
   end
 
   def grab_free_port
@@ -102,7 +110,7 @@ class MysqlIsolatedServer
     end
     at_exit {
       Process.kill("TERM", pid)
-      #system("rm -Rf #{base}")
+      system("rm -Rf #{base}")
     }
     @pid = pid
     devnull.close

metadata

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