repctl 0.0.3 → 0.0.4

data/TODO

@@ -0,0 +1,9 @@
+1. Add a slave to an existing slave without
+breaking the first slave's relationship to
+its master.
+
+Use an option to add_slave?
+
+2. If you stop a slave and then restart it, it
+becomes a slave of instance 1, even if it was
+slaving off a different master before the shutdown.

data/bin/repctl

@@ -22,6 +22,10 @@ module Repctl
       run_mysql_query(instance, "START SLAVE")
     end
 
+    def do_stop_slave(instance)
+      run_mysql_query(instance, "STOP SLAVE")
+    end
+
     def do_restart(instance)
       do_admin(instance, "shutown")
       do_start(instance)
@@ -141,7 +145,7 @@ class RepctlCmds < Thor
     end
   end
   
-  desc "restart INSTANCE"  , "Stop and start a server instance."
+  desc "restart INSTANCE", "Stop and start a server instance."
   def restart(instance)
     say "Restarting instance #{instance}", :green
     do_stop(instance)
@@ -153,6 +157,12 @@ class RepctlCmds < Thor
     say "Starting slave #{slave}", :green
     do_start_slave(slave)
   end
+
+  desc "stop_slave SLAVE", "Issue STOP SLAVE on the SLAVE MySQL instance."
+  def stop_slave(slave)
+    say "Stopping slave #{slave}", :green
+    do_stop_slave(slave)
+  end
   
   desc "change_master MASTER SLAVE FILE POSITION", "Execute CHANGE MASTER TO on the SLAVE."
   def change_master(master, slave, file, position)
@@ -160,6 +170,12 @@ class RepctlCmds < Thor
     do_change_master(master, slave, :file => file, :position => position)
   end
   
+  desc "switch_master MASTER SLAVES", "Change the master of a running cluster."
+  def switch_master(master, *slaves)
+    do_switch_master(master, slaves)
+    say "Switching to master #{master}", :green
+  end
+
   desc "crash INSTANCE", "Crash a running server."
   def crash(instance)
     say "Crashing instance #{instance}", :red
@@ -186,10 +202,10 @@ class RepctlCmds < Thor
   def status
     todos = options[:servers] || all_live_instances
     unless todos.any?
-      say "No Running Servers.", :blue
+      say "No Running Servers.  Are you running as the mysql user?", :blue
       return
     end
-    header = sprintf("%-5s%-25s%-25s%-25s%-8s\n",
+    header = sprintf("%-5s%-27s%-27s%-27s%-8s\n",
       "inst", "master", "received", "applied", "lag")
       
     loop do  
@@ -197,29 +213,32 @@ class RepctlCmds < Thor
     
       todos.each do |i|
         coordinates = get_coordinates(i)
-        slave_status = get_slave_status(i)
-        is_slave = !(slave_status["Error"] == "MySQL server is not a slave.")
         master_file = coordinates[:file]
         master_pos =  coordinates[:position]
-        if is_slave
+        slave = is_slave?(i)
+        if slave
+          slave_status = get_slave_status(i)
           recv_file = slave_status["Master_Log_File"]
           recv_pos = slave_status["Read_Master_Log_Pos"]
           apply_file = slave_status["Relay_Master_Log_File"]
           apply_pos = slave_status["Exec_Master_Log_Pos"]
           lag = slave_status["Seconds_Behind_Master"]
+          master_host = slave_status["Master_Host"]
+          master_port = slave_status["Master_Port"]
+          master_instance = instance_for(master_host, master_port)
         end
-          
-        format = "%-5d%16s:%-8d"
-        if is_slave
+        
+        if slave
           if lag
             lag = lag.to_s
           else
             lag = "-"
           end
-          format += "%16s:%-8d%16s:%-8d%-8s"
-          str = sprintf(format, i, master_file, master_pos, recv_file, recv_pos,
-            apply_file, apply_pos, lag)
+          format = "%1d%-4s%16s:%-10d%16s:%-10d%16s:%-10d%-8s"
+          str = sprintf(format, i, "(#{master_instance.to_s})", master_file,
+            master_pos, recv_file, recv_pos, apply_file, apply_pos, lag)
         else
+          format = "%-5d%16s:%-10d"
           str = sprintf(format, i, master_file, master_pos)
         end
       
@@ -257,14 +276,18 @@ class RepctlCmds < Thor
     if options[:populate]
       invoke "utils:bench", [master, "/opt/MySQL/b2.properties"]
     end
-    file, position = invoke "mysql:dump", [master]
+    file, position = invoke "dump", [master]
     
     # Slave is running, but it is not yet configured as a slave.
     # Load slave from the dump file...
-    invoke "mysql:restore", [slave]
+    invoke "restore", [slave]
     
     do_change_master(master, slave, :file => file, :position => position)
     do_start_slave(slave)
+
+    do_cluster_user(slave)
+    do_repl_user(slave)
+
   end
 
   DEFAULT_MASTER = 1
@@ -383,13 +406,18 @@ class RepctlCmds < Thor
       do_reset(master)
       do_reset(slave1)
       do_reset(slave2)
-      do_cluster_user(master)
-      do_repl_user(master)
     else
       do_restart(master)
       do_restart(slave1)
       do_restart(slave2)
     end
+    # Set up the replication accounts for all servers, in case we
+    # decide to switch masters later.
+    [master, slave1, slave2].each do |s|
+      do_cluster_user(s)
+      do_repl_user(s)
+    end
+
     coordinates = get_coordinates(master)
     file = coordinates[:file]
     position = coordinates[:position]
@@ -400,7 +428,7 @@ class RepctlCmds < Thor
     do_start_slave(slave2)
   end
 
-  desc "install sample config files to DIRECTORY", "After initial install, use these "
+  desc "install_sample_configs DIRECTORY", "After initial install, use these "
   "as templates for configuration. The target directory must exist and be empty."
   def install_sample_configs(dest_dir) 
     source_dir =  File.join(Repctl::Config.const_get(:GEM_HOME), "config")

data/config/mysql.cnf

@@ -39,6 +39,8 @@ query_cache_size= 16M
 # Try number of CPU's*2 for thread_concurrency
 thread_concurrency = 8
 plugin-dir=/usr/local/mysql/lib/plugin
+general-log=1
+log-output=FILE # or TABLE
 
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
@@ -52,6 +54,7 @@ plugin-dir=/usr/local/mysql/lib/plugin
 # binary logging is required for replication
 log-bin=mysql-bin
 log-slave-updates
+replicate-ignore-db = china 
 
 # binary logging format - mixed recommended
 binlog_format=mixed

data/lib/repctl/mysql_admin.rb

@@ -82,6 +82,8 @@ module Repctl
     #   do_repl_user
     #   do_cluster_user
     #   do_create_widgets
+    #   do_switch_master
+    #   do_stop_slave
     #   get_coordinates
     #   get_mysqld_pid
     #   get_slave_status
@@ -186,7 +188,9 @@ module Repctl
         "Relay_Master_Log_File",
         "Exec_Master_Log_Pos",
         "Relay_Log_File",
-        "Relay_Log_Pos"
+        "Relay_Log_Pos",
+        "Master_Host",
+        "Master_Port"
       ]
       results = {}
       status = do_slave_status(instance)
@@ -232,18 +236,18 @@ module Repctl
     # set global innodb_max_dirty_pages_pct = 75;
     # 
     
-    def do_change_master(master, slave, coordinates)
+    def do_change_master(master, slave, coordinates, opts = {})
       master_server = server_for_instance(master)
+      raise "master_server is nil" unless master_server
+          
       begin
         slave_connection = Client.open(slave)
         if slave_connection
           
-          # Replication on the slave can't be running if we want to execute
-          # CHANGE MASTER TO.  
+          # Replication on the slave can't be running if we want to
+          # execute CHANGE MASTER TO.  
           slave_connection.query("STOP SLAVE") rescue Mysql2::Error
           
-          raise "master_server is nil" unless master_server
-          
           cmd = <<-EOT
 CHANGE MASTER TO
   MASTER_HOST = \'#{master_server['hostname']}\',
@@ -261,7 +265,10 @@ EOT
       rescue Mysql2::Error => e
           puts e.message
       ensure
-        slave_connection.close if slave_connection
+        if slave_connection
+          slave_connection.query("START SLAVE") if opts[:restart]
+          slave_connection.close 
+        end
       end
     end
         
@@ -416,6 +423,31 @@ EOT
       Integer(File.open(pidfile, &:readline).strip)
     end
 
+    # 'master' is currently a slave that is to be the new master.
+    # 'slaves' contains the list of slaves, one of these may be the
+    # current master.
+    def do_switch_master(master, slaves)
+      master = master.to_i
+      slaves = slaves.map(&:to_i)
+
+      # Step 1. Make sure all slaves have completely processed their
+      # Relay Log.
+      slaves.each do |s|
+        # This will also stop the slave threads.
+        drain_relay_log(s) if is_slave?(s)
+      end
+      
+      # Step 2. For the slave being promoted to master, issue STOP SLAVE
+      # and RESET MASTER.  Get the coordinates of its binlog.
+      promote_slave_to_master(master)
+      coordinates = get_coordinates(master)
+
+      # Step 3.  Change the master for the other slaves.
+      slaves.each do |s|
+        do_change_master(master, s, coordinates, :restart => true)
+      end
+    end
+
     private
     
      # This is an example template to create commands to issue queries.
@@ -433,54 +465,13 @@ EOT
        client.close if client
      end
 
-    # 'master' is the new master
-    # 'slaves' is contains the list of slaves, one of these may be the current master.
-    def switch_master_to(master, slaves)
-
-      slaves = Array(slaves)
-      
-      # Step 1. Make sure all slaves have completely processed their
-      # Relay Log.
-      slaves.each do |s|
-        puts "Draining relay log for slave instance #{s}"
-        drain_relay_log(s) if is_slave?(s)
-      end
-      
-      # Step 2. For the slave being promoted to master, issue STOP SLAVE
-      # and RESET MASTER.
-      client = Client.open(master)
-      client.query("STOP SLAVE")
-      client.query("RESET MASTER")
-      client.close
-
-      # Step 3.  Change the master for the other slaves (and the former master?)
-      # XXX this is not complete -- what about the coordinates?
-      master_server = server_for_instance(master)
-      master_host = 'localhost' # should be master_server[:hostname]
-      master_user = 'repl'
-      master_password = 'har526'
-      master_port = master_server[:port]
-      slaves.each do |s|
-        client = Client.open(s)
-        cmd = <<-EOT
-          CHANGE MASTER TO
-            MASTER_HOST=\'#{master_host}\',
-            MASTER_PORT=#{master_port},
-            MASTER_USER=\'#{master_user}\',
-            MASTER_PASSWORD=\'#{master_password}\'
-        EOT
-        client.query(cmd)
-        client.query("START SLAVE")
-        client.close
-      end
-    end
     
     def is_master?(instance)
       get_slave_coordinates(instance).empty?
     end
 
     def is_slave?(instance)
-      !is_master?(instance)
+        get_slave_status(instance).has_key?("Slave_IO_State")
     end
     
     def find_masters()
@@ -513,7 +504,6 @@ EOT
       client.close if client
     end
 
-    # unused
     def promote_slave_to_master(instance)
       client = Client.open(instance)
       if client 
@@ -566,7 +556,8 @@ EOT
             end
           end
           puts "Waiting for slave to read relay log." unless done
-        end  
+        end
+        client.query("STOP SLAVE")
       else
         puts "Could not open connection to instance #{instance}."
       end
@@ -574,24 +565,6 @@ EOT
       client.close if client
     end
 
-=begin
-    # This is an example template to create commands to issue queries.
-    def do_slave_status(instance)
-      client = Client.open(instance)
-      if client
-        results = client.query("SHOW SLAVE STATUS")
-        results.each_with_index do |index, line|
-          puts "#{index}: #{line}"
-        end
-      else
-        puts "Could not open connection to MySQL instance #{instance}."
-      end
-    rescue Mysql2::Error => e
-      puts e.message
-    ensure
-      client.close if client
-    end
-=end
     #
     # Get the status of replication for the master and all slaves.
     # Return an array of hashes, each hash has the form:
@@ -629,10 +602,6 @@ EOT
   end
 end
 
-# STOP SLAVE
-# RESET MASTER
-# CHANGE MASTER TO
-
 class RunExamples
   include Repctl::Commands
   

data/lib/repctl/servers.rb

@@ -34,6 +34,15 @@ module Repctl
       get_mysqld_pid(instance)
     end
 
+    def instance_for(host, port)
+      @servers.each do |s|
+        if s["hostname"] == host && s["port"].to_i == port.to_i
+          return s["instance"].to_i
+        end
+      end
+      return nil
+    end
+
     private
 
     # Return the process ID (pid) for an instance. 

data/lib/repctl/version.rb

@@ -1,3 +1,3 @@
 module Repctl
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repctl
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &55282760 !ruby/object:Gem::Requirement
+  requirement: &76697300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *55282760
+  version_requirements: *76697300
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &55282340 !ruby/object:Gem::Requirement
+  requirement: &76696880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *55282340
+  version_requirements: *76696880
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &55281920 !ruby/object:Gem::Requirement
+  requirement: &76696460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *55281920
+  version_requirements: *76696460
 description: Ruby gem with Thor script to manage MySQL and PostgreSQL replication
 email:
 - lydianblues@gmail.com
@@ -56,6 +56,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- TODO
 - bin/repctl
 - config/bristlecone.properties
 - config/config.rb