repctl 0.0.5 → 0.0.6

data/bin/repctl

@@ -203,10 +203,19 @@ class RepctlCmds < Thor
   # Setting Up Replication with Existing Data using the 'mysqldump' utility. The
   # master has existing data.
   #
-  desc "add_slave MASTER SLAVE", "Master has some data that is used to initialize the slave."
+  desc "add_slave MASTER SLAVE", "Establish a new master/slave relationship."
+  method_option :sync, :type  => :boolean, :aliases => "-s",
+    :default => false,  :desc => "Initialize slave via dump/restore from master"
+  method_option :dumpfile, :type  => :string, :aliases => "-d",
+    :default => DEFAULT_DUMPFILE,  :desc => "Name of the dumpfile"
+  long_desc <<-EOS
+    Add a new slave to an existing server which may already be the
+    master for some other slaves.  The 'sync' option is destroys any
+    data that may already be on the slave.  Before replicaton is started
+    the slave is initialized via dump/restore from the master.
+  EOS
   def add_slave(master, slave)
-    dumpfile = DEFAULT_DUMPFILE
-    do_add_slave(master, slave, dumpfile)
+    do_add_slave(master, slave, options)
   end
 
   desc "remove_slave SLAVE", "Remove a slave from the replica set."

data/lib/repctl/helpers.rb

@@ -3,6 +3,7 @@ module Repctl
 
     include Commands
     include Servers
+    include Config
 
     def do_stop(instance)
       do_admin(instance, "shutdown")
@@ -24,7 +25,7 @@ module Repctl
     end
 
     def do_restart(instance)
-      do_admin(instance, "shutown")
+      do_admin(instance, "shutdown")
       do_start(instance)
     end
 
@@ -96,10 +97,16 @@ module Repctl
       output
     end
 
-    def do_add_slave(master, slave, dumpfile)
-      do_reset(slave)
-      coordinates = do_dump(master, dumpfile)
-      do_restore(slave, dumpfile)
+    def do_add_slave(master, slave, options = {})
+      puts options.to_yaml
+      sync = options.has_key?(:sync) ? options[:sync] : false
+      dumpfile = options.has_key?(:dumpfile) ? options[:dumpfile] : DEFAULT_DUMPFILE
+      if sync
+        do_reset(slave)
+        coordinates = do_dump(master, dumpfile)
+        do_restore(slave, dumpfile)
+      end
+      coordinates = get_coordinates(master)
       do_change_master(master, slave, coordinates)
       do_start_slave(slave)
       do_cluster_user(slave)
@@ -119,7 +126,8 @@ module Repctl
     end
 
     def do_repl_trio(master, slave1, slave2, options = {})
-      if options[:reset]
+      reset = options.has_key?(:reset) ? options[:reset] : true
+      if reset
         do_reset(master)
         do_reset(slave1)
         do_reset(slave2)

data/lib/repctl/mysql_admin.rb

@@ -113,6 +113,27 @@ module Repctl
       if pid
         puts "Instance #{instance} with PID #{pid} is already running."
       else 
+        server = server_for_instance(instance)
+        puts "Starting instance #{instance} with PID #{Process.pid}."
+        pid = spawn(["#{MYSQL_HOME}/bin/mysqld", "mysqld"], 
+          "--defaults-file=#{server['defaults-file']}",
+          "--datadir=#{server['datadir']}",
+          "--port=#{server['port']}",
+          "--server-id=#{server['server-id']}",
+          "--innodb_data_home_dir=#{server['innodb_data_home_dir']}",
+          "--innodb_log_group_home_dir=#{server['innodb_log_group_home_dir']}",
+          "--relay-log=#{Socket.gethostname}-relay-bin",
+          "--socket=#{server['socket']}",
+          "--user=#{server['user']}")
+        Process.detach(pid)
+        unless live?(instance)
+          puts "Waiting for server..."
+          sleep(1)
+        end
+      end
+    end
+
+=begin
         pid = fork
         unless pid
           # We're in the child.
@@ -129,9 +150,10 @@ module Repctl
             "--relay-log=#{Socket.gethostname}-relay-bin",
             "--socket=#{server['socket']}",
             "--user=#{server['user']}")
+          Process.detach(pid)
         end
-      end
     end
+=end
     
     def do_admin(instance, operation)
       server = server_for_instance(instance)
@@ -379,12 +401,16 @@ EOT
       
       if client
         cmd = "CREATE USER \'cluster\'@\'localhost\' IDENTIFIED BY \'secret\'"
+        puts cmd
         client.query(cmd)
         cmd = "GRANT ALL PRIVILEGES ON *.* TO \'cluster\'@'\localhost\'"
+        puts cmd
         client.query(cmd)
         cmd = "CREATE USER \'cluster\'@\'%\' IDENTIFIED BY \'secret\'"
+        puts cmd
         client.query(cmd)
         cmd = "GRANT ALL PRIVILEGES ON *.* TO \'cluster\'@\'%\'"
+        puts cmd
         client.query(cmd)
       else
         puts "Could not open connection to MySQL instance #{instance}."

data/lib/repctl/version.rb

@@ -1,3 +1,3 @@
 module Repctl
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/webserver/public/javascripts/repctl.js

@@ -0,0 +1,51 @@
+/* Fix this.  It should not be in the global namespace. */
+function getUpdate() { 
+  $('#status-table').load('/status');
+  setTimeout(getUpdate, 3000);
+}
+
+$(document).ready(function() { 
+   getUpdate();
+
+   $('#switch-master').submit(function() { 
+     $('#switch-master-result').html("")
+     $('.spinner').show();
+     $.post('/switch_master', $(this).serialize(), function(data) { 
+       $('.spinner').hide();
+       $('#switch-master-result').html(data)
+     });
+     return false;
+   });
+
+   $('#repl-trio').submit(function() { 
+     $('#repl-trio-result').html("")
+     $('#repl-trio-spinner').show();
+     $.post('/repl_trio', $(this).serialize(), function(data) { 
+       $('#repl-trio-spinner').hide();
+       $('#repl-trio-result').html(data)
+     });
+     return false;
+   });
+
+   $('#add-slave').submit(function() { 
+     $('#add-slave-result').html("")
+     $('#add-slave-spinner').show();
+     $.post('/add_slave', $(this).serialize(), function(data) { 
+       $('#add-slave-spinner').hide();
+       $('#add-slave-result').html(data)
+     });
+     return false;
+   });
+
+   $('#remove-slave').submit(function() { 
+     $('#remove-slave-result').html("")
+     $('#remove-slave-spinner').show();
+     $.post('/remove_slave', $(this).serialize(), function(data) { 
+       $('#remove-slave-spinner').hide();
+       $('#remove-slave-result').html(data)
+     });
+     return false;
+   });
+
+});
+

data/webserver/public/stylesheets/repctl.css

@@ -0,0 +1,35 @@
+#banner { 
+  text-align: center;
+}
+.spinner { 
+  display:none;
+}
+.success { 
+  color: green;
+}
+.failure { 
+  color: red;
+}
+table.gridtable {
+  font-family: verdana,arial,sans-serif;
+  font-size:11px;
+  color:#333333;
+  border-width: 1px;
+  border-color: #666666;
+  border-collapse: collapse;
+}
+table.gridtable th {
+  border-width: 1px;
+  padding: 8px;
+  border-style: solid;
+  border-color: #666666;
+  background-color: #dedede;
+}
+table.gridtable td {
+  border-width: 1px;
+  padding: 8px;
+  border-style: solid;
+  border-color: #666666;
+  background-color: #ffffff;
+}
+

data/webserver/views/layout.erb

@@ -3,75 +3,14 @@
 <head>
   <meta charset="utf-8" />
   <title>MySQL Replication Manager</title>
-  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js">
-  </script>
-
-  <script type="text/javascript">
-    /* Fix this.  It should not be in the global namespace. */
-    function getUpdate() { 
-      $('#status-table').load('/status');
-      setTimeout(getUpdate, 3000);
-    }
-    $(document).ready(function() { 
-       getUpdate();
 
-       $('#switch-master').submit(function() { 
-         $('.spinner').show();
-         $.post('/switch_master', $(this).serialize(), function(data) { 
-           $('.spinner').hide();
-           $("#switch-master-result").html(data)
-         });
-         return false;
-       });
+  <link rel="stylesheet" href="stylesheets/repctl.css" type="text/css">
 
-       $('#repl-trio').submit(function() { 
-         $('#repl-trio-spinner').show();
-         $.post('/repl_trio', $(this).serialize(), function(data) { 
-           $('#repl-trio-spinner').hide();
-           $("#repl-trio-result").html(data)
-         });
-         return false;
-       });
-
-    });
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js">
+  </script>
+  <script type="text/javascript" src="javascripts/repctl.js">
   </script>
 
-  <style type="text/css">
-    #banner { 
-      text-align: center;
-    }
-    .spinner { 
-      display:none;
-    }
-    .success { 
-      color: green;
-    }
-    .failure { 
-      color: red;
-    }
-    table.gridtable {
-      font-family: verdana,arial,sans-serif;
-      font-size:11px;
-      color:#333333;
-      border-width: 1px;
-      border-color: #666666;
-      border-collapse: collapse;
-    }
-    table.gridtable th {
-      border-width: 1px;
-      padding: 8px;
-      border-style: solid;
-      border-color: #666666;
-      background-color: #dedede;
-    }
-    table.gridtable td {
-      border-width: 1px;
-      padding: 8px;
-      border-style: solid;
-      border-color: #666666;
-      background-color: #ffffff;
-    }
-  </style>
 </head>
 
 <body>

data/webserver/views/main.erb

@@ -28,7 +28,7 @@
     <form id="repl-trio" action="/repl_trio" method="post">
       <p>Master: <input type="text" name="repl_trio[master]" size="20"/></p>
       <p>Slaves: <input type="text" name="repl_trio[slaves]" size="20"/></p>
-      <input type="submit" value="Create Repliction Trio">
+      <input type="submit" value="Create Replication Trio">
     </form>
     <div>
       <div style="float:left;" id="repl-trio-result"></div>
@@ -36,3 +36,30 @@
     </div>
 </section>
 
+<section>
+  <header><h2>Add a New Slave to Replica Set</h2></header>
+    <form id="add-slave" action="/add_slave" method="post">
+      <p>Master: <input type="text" name="add_slave[master]" size="20"/></p>
+      <p>Slave: <input type="text" name="add_slave[slaves]" size="20"/></p>
+      <label for="add_slave[sync]">Synchronize slave to master before starting replication</label>
+      <input name="add_slave[sync]" value="sync" type="checkbox"/><br>
+      <input type="submit" value="Add Slave to Master">
+    </form>
+    <div>
+      <div style="float:left;" id="add-slave-result"></div>
+      <img style="float:left;" class="spinner" id='add-slave-spinner' src='images/wait30.gif' alt='spinner'></img>
+    </div>
+</section>
+
+<section>
+  <header><h2>Remove Slave from Replica Set</h2></header>
+    <form id="remove-slave" action="/remove_slave" method="post">
+      <p>Slave: <input type="text" name="remove_slave[slave]" size="20"/></p>
+      <input type="submit" value="Remove Slave from Replica Set">
+    </form>
+    <div>
+      <div style="float:left;" id="remove-slave-result"></div>
+      <img style="float:left;" class="spinner" id='remove-slave-spinner' src='images/wait30.gif' alt='spinner'></img>
+    </div>
+</section>
+

data/webserver/webserver.rb

@@ -4,7 +4,7 @@ require 'repctl'
 include Repctl::Config
 include Repctl::Commands
 include Repctl::Servers
-include Repctl::Utils
+include Repctl::Helpers
 include Repctl::Color
 
 def time
@@ -72,15 +72,70 @@ post '/switch_master' do
   end
 end
 
+# curl deimos:9393/add_slave --header "Accept: text/plain" \
+#   -d add_slave[master]=1 -d add_slave[slaves]=3 -d add_slave[sync]=sync
+post '/add_slave' do
+  @message, master, slaves = master_slave_params(params["add_slave"])
+  options = {}
+  if params["add_slave"] && params["add_slave"]["sync"] == "sync"
+    options[:sync] = true
+  end
+  unless slaves && slaves[0]
+    @message = "You need to specify a slave"
+  end
+  if @message
+    @success = false
+  else
+    slave = slaves[0]
+    secs = time do
+      do_add_slave(master, slave, options)
+    end
+    @message = "Added slave #{slave} to master #{master} in #{secs} secs."
+    @success = true
+  end
+  if request.accept == ['text/plain']
+    if @success
+      "#{@message}\n".colorize(:green)
+    else
+      "#{@message}\n".colorize(:red)
+    end
+  else
+    erb :operation_complete, :layout => !request.xhr?
+  end
+end
+
+# curl deimos:9393/remove_slave --header "Accept: text/plain" \
+#   -d remove_slave[slave]=3
+post '/remove_slave' do
+  slave = params["remove_slave"]["slave"]
+  secs = time do
+    do_remove_slave(slave)
+  end
+  @message = "Removed slave #{slave} in #{secs} secs."
+  @success = true
+  if request.accept == ['text/plain']
+    if @success
+      "#{@message}\n".colorize(:green)
+    else
+      "#{@message}\n".colorize(:red)
+    end
+  else
+    erb :operation_complete, :layout => !request.xhr?
+  end
+end
+
+# curl deimos:9393/repl_trio --header "Accept: text/plain" \
+#   -d repl_trio[master]=1 -d repl_trio[slaves]="2 3"
 post '/repl_trio' do
   @message, master, slaves = master_slave_params(params["repl_trio"])
   if @message
     @success = false
   else
     secs = time do
-      sleep 1
+      do_repl_trio(master, slaves[0], slaves[1])
     end
-    @message = "Create replication trio with master #{master} and slaves #{slaves} in #{secs} secs."
+    @message = "Create replication trio with master #{master} and " +
+      "slaves #{slaves[0] and slaves[1]} in #{secs} secs."
     @success = true
   end
   if request.accept == ['text/plain']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repctl
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000Z
+date: 2012-03-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &121456320 !ruby/object:Gem::Requirement
+  requirement: &195841920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *121456320
+  version_requirements: *195841920
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &121455900 !ruby/object:Gem::Requirement
+  requirement: &195841500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *121455900
+  version_requirements: *195841500
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &121455480 !ruby/object:Gem::Requirement
+  requirement: &195841080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *121455480
+  version_requirements: *195841080
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &121455060 !ruby/object:Gem::Requirement
+  requirement: &195840660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *121455060
+  version_requirements: *195840660
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &121454640 !ruby/object:Gem::Requirement
+  requirement: &195840240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *121454640
+  version_requirements: *195840240
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &121454220 !ruby/object:Gem::Requirement
+  requirement: &195839820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *121454220
+  version_requirements: *195839820
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &121453800 !ruby/object:Gem::Requirement
+  requirement: &195839400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *121453800
+  version_requirements: *195839400
 description: Ruby gem with Thor script to manage MySQL and PostgreSQL replication
 email:
 - lydianblues@gmail.com
@@ -114,6 +114,8 @@ files:
 - lib/repctl/version.rb
 - repctl.gemspec
 - webserver/public/images/wait30.gif
+- webserver/public/javascripts/repctl.js
+- webserver/public/stylesheets/repctl.css
 - webserver/sass/config.rb
 - webserver/sass/sass/ie.scss
 - webserver/sass/sass/print.scss