mysql-slaver 0.1.10 → 0.1.11

data/lib/mysql_slaver/cli.rb

@@ -7,8 +7,8 @@ module MysqlSlaver
     option :replication_user,      :required => true, :desc => "DB user (on the master host), with replication permissions"
     option :replication_password,  :required => true, :desc => "DB password for the replication user"
     option :root_password,         :desc => "Password for the mysql root user (on both master and slave)"
-    option :port,                  :desc => "Mysql port (if not 3306)"
-    option :ssh_port,              :desc => "SSH port (if not 22)"
+    option :port,                  :default => 3306, :desc => "Mysql port"
+    option :ssh_port,              :default => 22,   :desc => "SSH port"
     option :sock,                  :desc => "Mysql socket file (if any)"
     option :no_copy,               :type => :boolean, :desc => "Do not copy data - just change master status"
 

data/lib/mysql_slaver/executor.rb

@@ -19,7 +19,8 @@ module MysqlSlaver
     def execute(cmd)
       string = cmd.is_a?(Array) ? cmd.join('; ') : cmd
       log "CMD: #{string}"
-      `#{string}`
+      result = `#{string}`
+      $?.success? ? result : nil
     end
   end
 end

data/lib/mysql_slaver/slaver.rb

@@ -6,6 +6,8 @@
 # connection)
 module MysqlSlaver
   class Slaver
+    include Logger
+
     attr_reader :status_fetcher, :data_copier, :master_changer, :no_copy
 
     def initialize(params)
@@ -51,6 +53,8 @@ module MysqlSlaver
       master_status = status_fetcher.status
       data_copier.copy! unless no_copy
       master_changer.change!(master_status)
+    rescue Exception => e
+      log e.message
     end
   end
 end

data/lib/mysql_slaver/status_fetcher.rb

@@ -15,10 +15,13 @@ module MysqlSlaver
     def status
       params = {:root_password => mysql_root_password, :socket_file => socket_file}
       cmd = mysql_command("show master status\\G", params)
-      data = executor.execute executor.ssh_command(cmd, master_host)
-      rtn = parse data
-      log "MASTER STATUS - file: #{rtn[:file]}, position: #{rtn[:position]}"
-      rtn
+      if data = executor.execute(executor.ssh_command(cmd, master_host))
+        rtn = parse data
+        log "MASTER STATUS - file: #{rtn[:file]}, position: #{rtn[:position]}"
+        rtn
+      else
+        raise Exception.new("Failed to get master status")
+      end
     end
 
     private

data/lib/mysql_slaver.rb

@@ -3,6 +3,7 @@ require 'thor'
 
 libdir = File.join(File.dirname(__FILE__), 'mysql_slaver')
 
+require "#{libdir}/exception"
 require "#{libdir}/logger"
 require "#{libdir}/logger"
 require "#{libdir}/executor"

data/spec/mysql_slaver/slaver_spec.rb

@@ -17,6 +17,26 @@ module MysqlSlaver
         }
       }
 
+      before do
+        slaver.stub(:log => nil)
+      end
+
+      context "when status_fetcher fails" do
+        before do
+          status_fetcher.stub(:status) { raise Exception.new("fail!") }
+        end
+
+        it "does not try to copy data" do
+          slaver.enslave!
+          expect(data_copier).to_not have_received(:copy!)
+        end
+
+        it "does not try to change master status" do
+          slaver.enslave!
+          expect(master_changer).to_not have_received(:change!)
+        end
+      end
+
       it "fetches master status" do
         slaver.enslave!
         expect(status_fetcher).to have_received(:status)

data/spec/mysql_slaver/status_fetcher_spec.rb

@@ -18,27 +18,42 @@ module MysqlSlaver
     end
 
     describe "#status" do
-      let(:output) { <<EOF
+      context "when ssh connection fails" do
+        before do
+          executor.stub(:execute => nil)
+        end
+
+        it "raises an error" do
+          expect {
+            fetcher.status
+          }.to raise_error(MysqlSlaver::Exception)
+        end
+      end
+
+      context "when ssh connection is valid" do
+
+        let(:output) { <<EOF
 *************************** 1. row ***************************
             File: mysql-bin.003219
         Position: 37065270
     Binlog_Do_DB:
 Binlog_Ignore_DB:
 EOF
-      }
+        }
 
-      before do
-        executor.stub(:execute => output)
-      end
-        
-      it "executes show master command over ssh" do
-        show_master = %[mysql  -u root -p supersekrit -e "show master status\\G"]
-        fetcher.status
-        expect(executor).to have_received(:ssh_command).with(show_master, 'my.db.host')
-      end
+        before do
+          executor.stub(:execute => output)
+        end
+
+        it "executes show master command over ssh" do
+          show_master = %[mysql  -u root -p supersekrit -e "show master status\\G"]
+          fetcher.status
+          expect(executor).to have_received(:ssh_command).with(show_master, 'my.db.host')
+        end
 
-      it "parses show master output" do
-        expect(fetcher.status).to eq({:file => 'mysql-bin.003219', :position => '37065270'})
+        it "parses show master output" do
+          expect(fetcher.status).to eq({:file => 'mysql-bin.003219', :position => '37065270'})
+        end
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mysql-slaver
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - David Salgado
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-04-20 00:00:00 Z
+date: 2014-04-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec