gizzmo 0.8.3 → 0.9.0

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.9.0

data/gizzmo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gizzmo}
-  s.version = "0.8.3"
+  s.version = "0.9.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-21}
+  s.date = %q{2010-11-01}
   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

@@ -176,8 +176,14 @@ module Gizzard
       help! "No shards specified" if shard_ids.empty?
       shard_ids.each do |shard_id_string|
         shard_id = ShardId.parse(shard_id_string)
-        service.list_upward_links(shard_id).each do |uplink|
-          service.list_downward_links(shard_id).each do |downlink|
+
+        upward_links = service.list_upward_links(shard_id)
+        downward_links = service.list_downward_links(shard_id)
+
+        help! "Shard must not be a root or leaf" if upward_links.length == 0 or downward_links.length == 0
+
+        upward_links.each do |uplink|
+          downward_links.each do |downlink|
             service.add_link(uplink.up_id, downlink.down_id, uplink.weight)
             new_link = LinkInfo.new(uplink.up_id, downlink.down_id, uplink.weight)
             service.remove_link(uplink.up_id, uplink.down_id)
@@ -211,6 +217,7 @@ module Gizzard
       shard_ids = @argv
       shard_ids.each do |shard_id_text|
         shard_id = ShardId.parse(shard_id_text)
+        next if !shard_id
         service.list_upward_links(shard_id).each do |link_info|
           output link_info.to_unix
         end
@@ -231,6 +238,30 @@ module Gizzard
     end
   end
 
+  class MarkbusyCommand < ShardCommand
+    def run
+      shard_ids = @argv
+      shard_ids.each do |shard_id|
+        id = ShardId.parse(shard_id)
+        service.mark_shard_busy(id, 1)
+        shard_info = service.get_shard(id)
+        output shard_info.to_unix
+      end
+    end
+  end
+
+  class MarkunbusyCommand < ShardCommand
+    def run
+      shard_ids = @argv
+      shard_ids.each do |shard_id|
+        id = ShardId.parse(shard_id)
+        service.mark_shard_busy(id, 0)
+        shard_info = service.get_shard(id)
+        output shard_info.to_unix
+      end
+    end
+  end
+
   class RepairCommand < ShardCommand
     def run
       args = @argv.dup.map{|a| a.split(/\s+/)}.flatten
@@ -294,6 +325,7 @@ module Gizzard
       shards = []
       command_options.write_only_shard ||= "com.twitter.gizzard.shards.WriteOnlyShard"
       additional_hosts = (command_options.hosts || "").split(/[\s,]+/)
+      exclude_hosts = (command_options.exclude_hosts || "").split(/[\s,]+/)
       ids = @argv.map{|arg| ShardId.new(*arg.split("/")) rescue nil }.compact
       by_host = ids.inject({}) do |memo, id|
         memo[id.hostname] ||= NamedArray.new(id.hostname)
@@ -305,10 +337,32 @@ module Gizzard
         by_host[host] ||= NamedArray.new(host)
       end
 
+      exclude_hosts.each do |host|
+        by_host[host] ||= NamedArray.new(host)
+      end
+
       sets = by_host.values
+      exclude_sets = exclude_hosts.map{|host| by_host[host]}
+      target_sets = sets - exclude_sets
+
+      exclude_sets.each do |set|
+        while set.length > 0
+          sorted = target_sets.sort_by{|s| s.length}
+          shortest = sorted.first
+          shortest.push set.pop
+        end
+      end
+
+      exclude_sets.each do |set|
+        while set.length > 0
+          sorted = target_sets.sort_by{|s| s.length}
+          shortest = sorted.first
+          shortest.push set.pop
+        end
+      end
 
       begin
-        sorted = sets.sort_by{|s| s.length }
+        sorted = target_sets.sort_by{|s| s.length }
         longest = sorted.last
         shortest = sorted.first
         shortest.push longest.pop
@@ -391,27 +445,27 @@ module Gizzard
 
   class ReportCommand < ShardCommand
     def run
-      
+
       things = @argv.map do |shard|
         parse(down(ShardId.parse(shard))).join("\n")
       end
-      
+
       if command_options.flat
         things.zip(@argv).each do |thing, shard_id|
           puts "#{sign(thing)}\t#{shard_id}"
         end
       else
         group(things).each do |string, things|
-          puts "=== " + sign(string) + ": #{things.length}" + " ====================" 
+          puts "=== " + sign(string) + ": #{things.length}" + " ===================="
           puts string
         end
       end
     end
-    
+
     def sign(string)
       ::Digest::MD5.hexdigest(string)[0..10]
     end
-    
+
     def group(arr)
       arr.inject({}) do |m, e|
         m[e] ||= []
@@ -419,11 +473,11 @@ module Gizzard
         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) 
+        id, prefix = parse(obj.keys.first, id, depth, sub)
         [prefix] + parse(obj.values.first, id, depth + 1, sub)
       when String
         host, prefix = obj.split("/")
@@ -437,7 +491,7 @@ module Gizzard
         end
       end
     end
-    
+
     def down(id)
       vals = service.list_downward_links(id).map do |link|
         down(link.down_id)
@@ -445,8 +499,8 @@ module Gizzard
       {id.to_unix => vals}
     end
   end
-  
-  class DrillCommand < ReportCommand 
+
+  class DrillCommand < ReportCommand
     def run
       signature = @argv.shift
       @argv.map do |shard|

data/lib/gizzmo.rb

@@ -85,10 +85,12 @@ subcommands = {
     opts.on("-w", "--write-only=CLASS") do |w|
       subcommand_options.write_only_shard = w
     end
-
     opts.on("-h", "--hosts=list") do |h|
       subcommand_options.hosts = h
     end
+    opts.on("-x", "--exclude-hosts=list") do |x|
+      subcommand_options.exclude_hosts = x
+    end
   end,
   'repair' => OptionParser.new do |opts|
     opts.banner = "Usage: #{zero} repair MASTER SLAVE [MASTER SLAVE...]"
@@ -102,6 +104,14 @@ subcommands = {
     opts.banner = "Usage: #{zero} subtree SHARD_ID"
     separators(opts, DOC_STRINGS["subtree"])
   end,
+  'markbusy' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} markbusy SHARD_ID"
+    separators(opts, DOC_STRINGS["markbusy"])
+  end,
+  'markunbusy' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} markunbusy SHARD_ID"
+    separators(opts, DOC_STRINGS["markunbusy"])
+  end,
   'hosts' => OptionParser.new do |opts|
     opts.banner = "Usage: #{zero} hosts"
     separators(opts, DOC_STRINGS["hosts"])
@@ -174,7 +184,7 @@ 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 [options]"
     separators(opts, DOC_STRINGS["report"])
@@ -182,7 +192,7 @@ subcommands = {
       subcommand_options.flat = true
     end
   end,
-  
+
   'lookup' => OptionParser.new do |opts|
     opts.banner = "Usage: #{zero} lookup [options] TABLE_ID SOURCE"
     separators(opts, DOC_STRINGS["lookup"])
@@ -263,7 +273,7 @@ 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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 3
-  version: 0.8.3
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -07:00
+date: 2010-11-01 00:00:00 -07:00
 default_executable: gizzmo
 dependencies: []