gizzmo 0.7.5 → 0.8.0

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.8.0

data/gizzmo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gizzmo}
-  s.version = "0.7.5"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2010-10-05}
+  s.date = %q{2010-10-20}
   s.default_executable = %q{gizzmo}
   s.description = %q{Gizzmo is a command-line client for managing gizzard clusters.}
   s.email = %q{kmaxwell@twitter.com}

data/lib/gizzard/commands.rb

@@ -1,4 +1,5 @@
 require "pp"
+require "digest/md5"
 module Gizzard
   class Command
     include Thrift
@@ -390,21 +391,60 @@ module Gizzard
 
   class ReportCommand < ShardCommand
     def run
-      regex = @argv.first
-      help!("regex is a required option") unless regex
-      regex = Regexp.compile(regex)
-      service.list_hostnames.map do |host|
-        puts host
-        counts = {}
-        service.shards_for_hostname(host).each do |shard|
-          id = shard.id.to_unix
-          if key = id[regex, 1] || id[regex, 0]
-            counts[key] ||= 0
-            counts[key] += 1
-          end
+      things = @argv.map do |shard|
+        parse(down(ShardId.parse(shard))).join("\n")
+      end
+      
+      group(things).each do |string, things|
+        puts "=== " + sign(string) + ": #{things.length}" + " ====================" 
+        puts string
+      end
+    end
+    
+    def sign(string)
+      ::Digest::MD5.hexdigest(string)[0..10]
+    end
+    
+    def group(arr)
+      arr.inject({}) do |m, e|
+        m[e] ||= []
+        m[e] << e
+        m
+      end.to_a.sort_by{|k, v| v.length}.reverse
+    end
+    
+    def parse(obj, id = nil, depth = 0, sub = true)
+      case obj
+      when Hash
+        id, prefix = parse(obj.keys.first, id, depth, sub) 
+        [prefix] + parse(obj.values.first, id, depth + 1, sub)
+      when String
+        host, prefix = obj.split("/")
+        host = "db" if host != "localhost" && sub
+        id ||= prefix[/\w+ward_\d+_\d+/]
+        prefix = ("  " * depth) + host + "/" + (sub ? prefix.sub(id, "[ID]") : prefix)
+        [id, prefix]
+      when Array
+        obj.map do |e|
+          parse e, id, depth, sub
         end
-        counts.sort.each do |k, v|
-          puts "  %3d %s" % [v, k]
+      end
+    end
+    
+    def down(id)
+      vals = service.list_downward_links(id).map do |link|
+        down(link.down_id)
+      end
+      {id.to_unix => vals}
+    end
+  end
+  
+  class DrillCommand < ReportCommand 
+    def run
+      signature = @argv.shift
+      @argv.map do |shard|
+        if sign(parse(down(ShardId.parse(shard))).join("\n")) == signature
+          puts parse(down(ShardId.parse(shard)), nil, 0, false).join("\n")
         end
       end
     end

data/lib/gizzmo.rb

@@ -78,10 +78,6 @@ subcommands = {
     opts.banner = "Usage: #{zero} wrap CLASS_NAME SHARD_ID_TO_WRAP [MORE SHARD_IDS...]"
     separators(opts, DOC_STRINGS["wrap"])
   end,
-  'report' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{zero} report RUBY_REGEX"
-    separators(opts, DOC_STRINGS["report"])
-  end,
   'rebalance' => OptionParser.new do |opts|
     opts.banner = "Usage: #{zero} rebalance"
     separators(opts, DOC_STRINGS["rebalance"])
@@ -166,6 +162,10 @@ subcommands = {
     opts.banner = "Usage: #{zero} reload"
     separators(opts, DOC_STRINGS["reload"])
   end,
+  'drill' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} drill SIGNATURE"
+    separators(opts, DOC_STRINGS["drill"])
+  end,
   'addlink' => OptionParser.new do |opts|
     opts.banner = "Usage: #{zero} addlink PARENT_SHARD_ID CHILD_SHARD_ID WEIGHT"
     separators(opts, DOC_STRINGS["addlink"])
@@ -174,6 +174,12 @@ subcommands = {
     opts.banner = "Usage: #{zero} unlink PARENT_SHARD_ID CHILD_SHARD_ID"
     separators(opts, DOC_STRINGS["unlink"])
   end,
+  
+  'report' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} report"
+    separators(opts, DOC_STRINGS["report"])
+  end,
+  
   'lookup' => OptionParser.new do |opts|
     opts.banner = "Usage: #{zero} lookup [options] TABLE_ID SOURCE"
     separators(opts, DOC_STRINGS["lookup"])
@@ -254,6 +260,10 @@ global = OptionParser.new do |opts|
   opts.on("-r", "--retry=TIMES", "TIMES to retry the command") do |r|
     global_options.retry = r
   end
+  
+  opts.on("-t", "--timeout=SECONDS", "SECONDS to let the command run") do |r|
+    global_options.timeout = r
+  end
 
   opts.on("--subtree", "Render in subtree mode") do
     global_options.render << "subtree"
@@ -328,11 +338,32 @@ while !$stdin.tty? && line = STDIN.gets
   argv << line.strip
 end
 
+def custom_timeout(seconds)
+  if seconds
+    begin
+      require "rubygems"
+      require "system_timer"
+      SystemTimer.timeout_after(seconds.to_i) do
+        yield
+      end
+    rescue LoadError
+      require "timeout"
+      Timeout.timeout(seconds.to_i) do
+        yield
+      end
+    end
+  else
+    yield
+  end
+end
+
 tries_left = global_options.retry.to_i + 1
 begin
   while (tries_left -= 1) >= 0
     begin
-      Gizzard::Command.run(subcommand_name, global_options, argv, subcommand_options, log)
+      custom_timeout(global_options.timeout) do
+        Gizzard::Command.run(subcommand_name, global_options, argv, subcommand_options, log)
+      end
       break
     rescue
       if tries_left > 0

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 5
-  version: 0.7.5
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2010-10-20 00:00:00 -07:00
 default_executable: gizzmo
 dependencies: []