mmtop 0.9.4 → 0.9.5

data/lib/mmtop/filters/map_topology.rb

@@ -1,3 +1,6 @@
+# I'd like to say that I no longer understand this code.
+# Also, I'd like to say that it's unlikely to work for you, the general public.  patches welcome!
+
 module MMTop
   class Topology
     def initialize(config)
@@ -10,9 +13,10 @@ module MMTop
 
       new_top = create_sort_array(topology)
 
-      hosts = @config.hosts.sort_by { |h| new_top.find_index { |t| t[:hostname] == h.name } }
+      hosts = @config.hosts.sort_by { |h| new_top.find_index { |t| t[:hostname] == h.name } || 1_000_000 }
       hosts.each { |h|
         top = new_top.find { |t| t[:hostname] == h.name }
+        next unless top
         if top[:levels] > 0 
           h.display_name = ("  " * top[:levels]) + '\_' + h.name
         end
@@ -70,7 +74,11 @@ module MMTop
 
     def find_master_slave
       topology = @config.hosts.inject({}) { |accum, h|
-        hostname = h.query("show global variables where Variable_name='hostname'")[0][:Value]
+        rows = h.query("show global variables where Variable_name='hostname'")
+        next accum if rows.empty?
+
+        hostname = rows.first[:Value]
+
         hostname = hostname.split('.')[0]
         status = h.slave_status
 
@@ -107,9 +115,18 @@ module MMTop
   end
 
   Filter.add_filter("discover_topology") do |queries, hostinfo, config|
-    if !config.options['discovered']
-      config.options['discovered'] = true
+    if config.options['discover_topology'] && !config.options['topology.discovered']
+      config.options['topology.discovered'] = true
       config.hosts = MMTop::Topology.new(config).new_hostlist
-    end 
+    end
+  end
+
+  MMTop::Command.register do |c|
+    c.regexp /map_topology/
+    c.usage "map_topology"
+    c.explain "Re-Map the slave-chain topology"
+    c.command do |cmd, config|
+      config.options['discovered'] = false
+    end
   end
 end

data/lib/mmtop/host.rb

@@ -1,3 +1,5 @@
+require 'mmtop/qps'
+
 module MMTop
   class Host
     def initialize(hostname, user, password, options)
@@ -8,20 +10,43 @@ module MMTop
       m2opts[:socket] = options['socket'] if options['socket']
       m2opts[:port] = options['port'] if options['port']
       m2opts[:reconnect] = true
-      @mysql = Mysql2::Client.new(m2opts)
-      # rescue connection errors or sumpin
       @options = options
       @name = hostname
       @display_name = @name
       @comment = options['comment']
       @last_queries = nil
+
+      begin
+        @mysql = Mysql2::Client.new(m2opts)
+      rescue Mysql2::Error => e
+        if e.error_number == 2003
+          mark_dead!
+        else
+          raise e
+        end
+      end
+
+      # rescue connection errors or sumpin
     end
 
     attr_accessor :display_name, :name, :comment, :options
 
     def query(q)
+      return [] if dead?
+
       res = []
-      ret = @mysql.query(q)
+      begin
+        ret = @mysql.query(q)
+      rescue Mysql2::Error => e
+        if [2007, 2013, 2003].include?(e.error_number)
+          mark_dead!
+          return []
+        else
+          puts "Got error number " + e.error_number.to_s
+          raise e
+        end
+      end
+
       return nil unless ret
       ret.each(:symbolize_keys => true) do |r|
         res << r
@@ -29,6 +54,14 @@ module MMTop
       res
     end
 
+    def mark_dead!
+      @dead = true
+    end
+
+    def dead?
+      @dead
+    end
+
     def slave_status
       return nil if @options['expect_slave'] == false
       res = query("show slave status")[0]
@@ -42,20 +75,15 @@ module MMTop
 
     def stats
       stats = {}
-      queries = query("show global status like 'Questions'")[0][:Value].to_i
-
-      if @last_queries
-        elapsed = Time.now.to_i - @last_queries[:time]
-        if elapsed > 0 
-          qps = (queries - @last_queries[:count]) / elapsed
-        else 
-          qps = queries - @last_queries[:count]
-        end
-        stats[:qps] = qps
-      end
-      @last_queries = {}
-      @last_queries[:count] = queries
-      @last_queries[:time] = Time.now.to_i
+      row = query("show global status like 'Questions'")
+      return {} if row.empty?
+
+      queries = row.first[:Value].to_i
+
+      @qps ||= MMTop::QPS.new
+      @qps.add_sample(queries, Time.now)
+      stats[:qps] = @qps.calc.to_i
+
       stats
     end
 

data/lib/mmtop/mmconfig.rb

@@ -18,12 +18,7 @@ module MMTop
         h['password'] ||= (pass || config['password'])
         h['wedge_monitor'] ||= config['wedge_monitor']
 
-        begin
-          Host.new(h['host'], h['user'], h['password'], h)
-        rescue Mysql2::Error => e
-          puts e
-          nil
-        end
+        Host.new(h['host'], h['user'], h['password'], h)
       end.compact
 
       @filters = MMTop::Filter.default_filters

data/lib/mmtop/qps.rb

@@ -0,0 +1,46 @@
+module MMTop
+  class QPS
+    DEFAULT_WINDOW = 20
+
+    QUERIES = 0
+    TIME = 1
+    def self.window
+      @window || DEFAULT_WINDOW
+    end
+  
+    def self.window=(window)
+      @window = window
+    end
+
+    def window
+      self.class.window
+    end
+
+    def add_sample(queries, time)
+      samples.push [queries, time]
+      clean_samples
+    end
+
+    def calc
+      clean_samples
+      return '...' if samples.size == 1
+
+      queries = samples.last[QUERIES] - samples.first[QUERIES]
+      time = samples.last[TIME].to_i - samples.first[TIME].to_i
+    
+      queries / time
+    end
+
+  private
+
+    def clean_samples
+      while samples.first[TIME].to_i < (Time.now.to_i - window)
+        samples.shift
+      end
+    end
+
+    def samples
+      @samples ||= []
+    end
+  end
+end

data/lib/mmtop/term_printer.rb

@@ -133,14 +133,16 @@ module MMTop
       str = pipe + " " + column_value(0, p.client, ' ', :right)
       str += info_sep + column_value(1, p.id ? p.id.to_s : '')
       str += info_sep + column_value(2, format_time(p.time))
-      str += info_sep 
+      str += info_sep
       str += format_process(p, @x - str.size - 1)
       str += " " * (@x - str.size - 1) + pipe
       puts str
     end
 
     def print_host(info)
-      str = pipe + " " + column_value(0, info.host.display_name + " " + (info.host.comment || ""), "-".dark_gray)
+      display_name = info.host.display_name
+      display_name = (display_name + "!").red if info.host.dead?
+      str = pipe + " " + column_value(0, display_name + " " + (info.host.comment || ""), "-".dark_gray)
       str += sep_fill + column_fill(1) + sep_fill + column_fill(2)
       str += info_sep + column_value(3, info.connections.size.to_s)
       str += info_sep + column_value(4, format_slave_status(info.slave_status))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mmtop
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Ben Osheroff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 +00:00
+date: 2012-02-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,7 @@ files:
 - lib/mmtop/process.rb
 - lib/mmtop/host.rb
 - lib/mmtop/term_input.rb
+- lib/mmtop/qps.rb
 - lib/mmtop/term_printer.rb
 - lib/mmtop/commands/filters.rb
 - lib/mmtop/commands/kill.rb