sr-scripts 0.1.10 → 0.1.11

data/bin/sr-detect-slaves

@@ -56,19 +56,35 @@ def print_all_slaves (server, all_servers, padding)
   slave_servers = all_servers.find_all { |s| s.tags["master_instance_id"] == server.id }
   slave_servers.each do |slave|
     padding += 6
-    print_server(slave, padding)
-
-    print_all_slaves(slave, all_servers, padding) unless slave.tags["master_status"] == "master"
+    unless slave.tags["master_status"] == "master"
+      print_server(slave, padding)
+      print_all_slaves(slave, all_servers, padding) 
+    end
   end
 end
 
+
 master_servers = all_servers.find_all { |server| server.tags["master_status"] == "master" }
 p master_servers.length
 
+$found_servers = []
+
 master_servers.each do |master|
   p "FOUND MASTER: #{master.id}"
   padding = 10 
   print_server(master, padding)
+  $found_servers.push master.id
+  print_all_slaves(master, all_servers, padding)
+end
+
+
+master_servers = all_servers.find_all { |server| server.tags["master_status"] == "master-retired" }
+p master_servers.length
+
+master_servers.each do |master|
+  p "FOUND RETIRED MASTER: #{master.id}"
+  padding = 10 
+  print_server(master, padding)
   print_all_slaves(master, all_servers, padding)
 end
 

data/bin/sr-log-monitor

@@ -14,7 +14,8 @@ file_changes = false
 files.each do |file|
 	p "File Not Found: #{file}" && break unless File.exists?(file)
 	last_position = positions[file] || 0
-	if last_position != File.size?(file)
+  file_size = File.size?(file) || 0
+	if last_position != file_size
 		f = File.open(file, 'rb')
 		f.seek last_position
 		puts "#### #{file} #####"
@@ -22,7 +23,7 @@ files.each do |file|
 		puts "#### #{file} END ####"
 		file_changes = true
 	end
-	positions[file] = File.size?(file)
+	positions[file] = file_size
 end
 
 File.open(position_file, 'w') do |f|

data/bin/sr-promote-to-master

@@ -7,6 +7,7 @@ require 'optparse'
 require 'sr-scripts'
 
 options = {}
+options[:skip_master] = false
 
 optparse = OptionParser.new do|opts|
   opts.on( '--current-master-id INSTANCE_ID', 'AWS Instance Id Of Current Master Machine') do |o|
@@ -21,6 +22,9 @@ optparse = OptionParser.new do|opts|
   opts.on( '--mysql-pass PASSWORD', 'Mysql Password') do |o|
     options[:mysql_password] = o
   end
+  opts.on( '--skip-master', 'Use This Flag To Skip Connecting To --current-master-id') do |o|
+    options[:skip_master] = true
+  end
   opts.on( '-h', '--help', 'Display this screen' ) do
     puts opts
     exit
@@ -30,7 +34,7 @@ end
 optparse.parse!
 
 if(options[:current_master_id] == nil || options[:new_master_id] == nil)
-	p "Must specify --current-master-id AND --new-master-id"
+  puts "Must specify --current-master-id, --new-master-id, --mysql-user, --mysql-pass"
 	exit
 end
 
@@ -40,31 +44,51 @@ def kill_mysql_connections(db)
 	results = db.query "SHOW PROCESSLIST"
 	results.each_hash do |row|
 		unless row["User"] == "system user" || row["Command"] == 'Binlog Dump' || row["Info"] == "SHOW PROCESSLIST"
-			puts row["Id"]
-			db.query "KILL #{row['Id']};"
+			puts "KILLING QUERY ID: #{row["Id"]}"
+      begin
+        db.query "KILL #{row['Id']};"
+      rescue
+        puts "INFO:  COULDN'T KILL CONNECTION ID #{row['Id']}"
+      end
 		end
 	end
 end
 
-def get_private_ip(fog, instance_id)
-	return fog.servers.get(instance_id).private_ip_address
+def get_public_ip(fog, instance_id)
+	return fog.servers.get(instance_id).public_ip_address
 end
 
 mysql_user = options[:mysql_user]
 mysql_pass = options[:mysql_password]
 
-current_master_ip = get_private_ip(connection, options[:current_master_id])
-new_master_ip = get_private_ip(connection, options[:new_master_id])
+current_master_ip = get_public_ip(connection, options[:current_master_id])
+new_master_ip = get_public_ip(connection, options[:new_master_id])
 
-current_master = Mysql.new(current_master_ip, mysql_user, mysql_pass)
-new_master = Mysql.new(new_master_ip, mysql_user, mysql_pass)
-
-current_master.query("SET GLOBAL read_only = 1")
-sleep 1 # HACKY CRAP
-kill_mysql_connections current_master 
-new_master.query("STOP SLAVE;")
-new_master.query("SET GLOBAL read_only = 0")
+current_master, new_master = nil
 
+unless options[:skip_master]
+  begin
+    current_master = Mysql.new(current_master_ip, mysql_user, mysql_pass)
+    p current_master.query("SELECT version();")
+  rescue 
+    puts "Error Connecting to --master-instance-id.  Try running with --skip-master"
+    exit 1
+  end
+end
 
+begin
+  new_master = Mysql.new(new_master_ip, mysql_user, mysql_pass)
+rescue
+  puts "Error connecting to new master"
+  exit 1
+end
 
+unless options[:skip_master]
+  current_master.query("SET GLOBAL read_only = 1")
+  sleep 1 # HACKY CRAP
+  kill_mysql_connections current_master 
+end
+new_master.query("STOP SLAVE;")
+new_master.query("SET GLOBAL read_only = 0")
 
+puts "Script Complete"

data/lib/sr-scripts/version.rb

@@ -1,5 +1,5 @@
 module Sr
   module Scripts
-    VERSION = "0.1.10"
+    VERSION = "0.1.11"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Davy Campano
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 -04:00
+date: 2012-03-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency