ar_mysql_flexmaster 0.0.8 → 0.1.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.0.8"
+  gem.version       = "0.1.0"
 
   gem.add_runtime_dependency("mysql2")
   gem.add_runtime_dependency("activerecord")

data/bin/master_cut

@@ -4,11 +4,29 @@ require 'bundler/setup'
 require 'mysql2'
 require 'socket'
 require 'pp'
+require "getoptlong"
 
 Thread.abort_on_exception = false
-$old_master, $new_master, $username, $password = *ARGV
-unless $old_master && $new_master && $username && $password
-  puts "Usage: master_cut OLD_MASTER NEW_MASTER USERNAME PASSWORD"
+
+opts = GetoptLong.new(
+  ["--password",      "-p", GetoptLong::REQUIRED_ARGUMENT],
+  ["--rehome-master",   "-r", GetoptLong::NO_ARGUMENT],
+)
+
+opts.each do |opt, arg|
+  case opt
+  when '--password'
+    $password = arg
+  when '--rehome-master'
+    $rehome_master = true
+  end
+end
+
+$old_master, $new_master, $username = *ARGV
+unless $old_master && $new_master && $username 
+  puts "Usage: master_cut OLD_MASTER NEW_MASTER ADMIN_USERNAME"
+  puts "                  [-p,--password PASSWORD]"
+  puts "                  [-r,--reset-slave]"
   exit
 end
 
@@ -33,6 +51,18 @@ def fail(reason)
   exit false
 end
 
+def ask_for_password
+  return unless $password.nil?
+
+  $stdout.write("Password for #{$username}: ")
+  begin
+    system "stty -echo"
+    $password = $stdin.gets.chomp
+  ensure
+    system "stty echo"
+  end
+end
+
 def preflight_check
   cx = open_cx($old_master)
   rw = cx.query("select @@read_only as read_only").first['read_only']
@@ -43,8 +73,14 @@ def preflight_check
   fail("new-master #{$old_master} is read-write!") if rw != 1
 
   slave_info = slave_cx.query("show slave status").first
+  fail("no slave configured!") if slave_info.nil?
   fail("slave is stopped!") unless slave_info['Slave_IO_Running'] == 'Yes' && slave_info['Slave_SQL_Running'] == 'Yes'
   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'
+    fail("I can't rehome the original master -- it has no slave user or password.")
+  end
  
   master_ip, slave_master_ip = [$old_master, slave_info['Master_Host']].map do |h|
     h = h.split(':').first
@@ -86,10 +122,23 @@ def swap_thread
     puts "Swapped #{$old_master} and #{$new_master}"
     puts "New master information at time of swap: "
     pp new_master_info 
+    if $rehome_master
+      rehome_master(new_master_info)
+    end
     exit
   end
 end
 
+def rehome_master(info)
+  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")
+end
+
+ask_for_password
 preflight_check
 
 threads = []
@@ -97,5 +146,7 @@ threads << process_kill_thread
 threads << swap_thread
 threads.each(&:join)
 
+rehome_master
+
 
 

data/gemfiles/rails2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ben/src/ar_mysql_flexmaster
   specs:
-    ar_mysql_flexmaster (0.0.5)
+    ar_mysql_flexmaster (0.0.8)
       activerecord
       activesupport
       mysql2

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ben/src/ar_mysql_flexmaster
   specs:
-    ar_mysql_flexmaster (0.0.5)
+    ar_mysql_flexmaster (0.0.8)
       activerecord
       activesupport
       mysql2

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ben/src/ar_mysql_flexmaster
   specs:
-    ar_mysql_flexmaster (0.0.5)
+    ar_mysql_flexmaster (0.0.8)
       activerecord
       activesupport
       mysql2

data/test/boot_mysql_env.rb

@@ -21,6 +21,7 @@ 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"
 
+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)
 

data/test/integration/no_traffic_test.rb

@@ -8,7 +8,7 @@ $mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
 
 puts "testing basic cutover..."
 
-system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root ''"
+system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p ''"
 if $mysql_master.connection.query("select @@read_only as ro").first['ro'] != 1
   puts "Master is not readonly!"
   exit 1

data/test/integration/there_and_back_again_test.rb

@@ -0,0 +1,27 @@
+require 'bundler/setup'
+require 'mysql2'
+require_relative '../boot_mysql_env'
+master_cut_script = File.expand_path(File.dirname(__FILE__)) + "/../../bin/master_cut"
+
+$mysql_master.connection.query("set GLOBAL READ_ONLY=0")
+$mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
+
+def assert_ro(cx, str, bool)
+  expected = bool ? 1 : 0
+  if expected != cx.query("select @@read_only as ro").first['ro']
+    $stderr.puts("#{str} is #{bool ? 'read-write' : 'read-only'} but I expected otherwise!")
+    exit 1
+  end
+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"
+assert_ro($mysql_master.connection, 'original master', true)
+assert_ro($mysql_slave.connection, 'original slave', false)
+
+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)
+
+puts "everything went real nice."
+

data/test/integration/with_queries_to_be_killed_test.rb

@@ -20,7 +20,7 @@ thread = Thread.new {
   end
 }
 
-system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root ''"
+system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p ''"
 
 thread.join
 

data/test/integration/wrong_setup_test.rb

@@ -5,7 +5,7 @@ require_relative '../boot_mysql_env'
 
 def assert_script_failed
   master_cut_script = File.expand_path(File.dirname(__FILE__)) + "/../../bin/master_cut"
-  if system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root ''"
+  if system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p ''"
     puts "Script returned ok instead of false!"
     exit 1
   end

data/test/mysql_isolated_server.rb

@@ -50,6 +50,7 @@ class MysqlIsolatedServer
       mysql_install_db = `which mysql_install_db`
       idb_path = File.dirname(mysql_install_db)
       system("(cd #{idb_path}/..; mysql_install_db --datadir=#{@mysql_data_dir}) >/dev/null 2>&1")
+      system("cp #{File.expand_path(File.dirname(__FILE__))}/user.MY* #{@mysql_data_dir}/mysql")
     end
 
     exec_server <<-EOL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -120,9 +120,13 @@ files:
 - test/boot_mysql_env.rb
 - test/boot_slave
 - test/integration/no_traffic_test.rb
+- test/integration/there_and_back_again_test.rb
 - test/integration/with_queries_to_be_killed_test.rb
 - test/integration/wrong_setup_test.rb
 - test/mysql_isolated_server.rb
+- test/user.MYD
+- test/user.MYI
+- test/user.frm
 homepage: ''
 licenses: []
 post_install_message: 
@@ -137,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1068549902361046667
+      hash: -2431803354911510217
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1068549902361046667
+      hash: -2431803354911510217
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -158,6 +162,10 @@ test_files:
 - test/boot_mysql_env.rb
 - test/boot_slave
 - test/integration/no_traffic_test.rb
+- test/integration/there_and_back_again_test.rb
 - test/integration/with_queries_to_be_killed_test.rb
 - test/integration/wrong_setup_test.rb
 - test/mysql_isolated_server.rb
+- test/user.MYD
+- test/user.MYI
+- test/user.frm