gizzmo 0.2.1 → 0.3.0

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+tmp

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/gizzmo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gizzmo}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2010-06-30}
+  s.date = %q{2010-07-09}
   s.default_executable = %q{gizzmo}
   s.description = %q{Gizzmo is a command-line client for managing gizzard clusters.}
   s.email = %q{kmaxwell@twitter.com}
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
      "test/expected/links-for-table_b_0.txt",
      "test/expected/links-for-table_repl_0.txt",
      "test/expected/original-find.txt",
+     "test/expected/subtree-info.txt",
      "test/expected/subtree.txt",
      "test/expected/unwrapped-replicating_table_b_0.txt",
      "test/expected/unwrapped-table_b_0.txt",

data/lib/gizzard/commands.rb

@@ -2,9 +2,15 @@ require "pp"
 module Gizzard
   class Command
     include Thrift
+    
+    attr_reader :buffer
 
-    def self.run(command_name, *args)
-      Gizzard.const_get("#{classify(command_name)}Command").new(*args).run
+    def self.run(command_name, service, global_options, argv, subcommand_options)
+      command = Gizzard.const_get("#{classify(command_name)}Command").new(service, global_options, argv, subcommand_options)
+      command.run
+      if command.buffer && command_name = global_options.render.shift
+        run(command_name, service, global_options, command.buffer, OpenStruct.new)
+      end
     end
 
     def self.classify(string)
@@ -22,8 +28,17 @@ module Gizzard
     def help!(message = nil)
       raise HelpNeededError, message
     end
+    
+    def output(string)
+      if global_options.render.any?
+        @buffer ||= []
+        @buffer << string.strip
+      else 
+        puts string
+      end
+    end
   end
-  
+
   class AddforwardingCommand < Command
     def run
       help! if argv.length != 3
@@ -40,7 +55,7 @@ module Gizzard
       end.reject do |forwarding|
         @command_options.table_ids && !@command_options.table_ids.include?(forwarding.table_id)
       end.each do |forwarding|
-        puts [ forwarding.table_id, forwarding.base_id, forwarding.shard_id.to_unix ].join("\t")
+        output [ forwarding.table_id, forwarding.base_id, forwarding.shard_id.to_unix ].join("\t")
       end
     end
   end
@@ -53,24 +68,24 @@ module Gizzard
         @roots << up(@id)
       end
       @roots.uniq.each do |root|
-        puts root.to_unix
-        down(root, 1)          
+        output root.to_unix
+        down(root, 1)
       end
     end
-    
+
     def up(id)
       links = service.list_upward_links(id)
       if links.empty?
         id
       else
-        links.map{|link| link.up_id }.find{|up_id| up(up_id) }
+        links.map { |link| link.up_id }.find { |up_id| up(up_id) }
       end
     end
 
     def down(id, depth = 0)
       service.list_downward_links(id).map do |link|
         printable = "  " * depth + link.down_id.to_unix
-        puts printable
+        output printable
         down(link.down_id, depth + 1)
       end
     end
@@ -84,10 +99,10 @@ module Gizzard
         STDERR.puts "aborted"
       end
     end
-    
+
     def ask
-      puts "Are you sure? Reloading will affect production services immediately! (Type 'yes')"
-      gets.chomp == "yes" 
+      output "Are you sure? Reloading will affect production services immediately! (Type 'yes')"
+      gets.chomp == "yes"
     end
   end
 
@@ -96,7 +111,7 @@ module Gizzard
       argv.each do |arg|
         id  = ShardId.parse(arg)
         service.delete_shard(id)
-        puts id.to_unix
+        output id.to_unix
       end
     end
   end
@@ -106,19 +121,19 @@ module Gizzard
       up_id, down_id, weight = argv
       help! if argv.length != 3
       weight = weight.to_i
-      up_id  = ShardId.parse(up_id)
-      down_id  = ShardId.parse(down_id)
+      up_id = ShardId.parse(up_id)
+      down_id = ShardId.parse(down_id)
       link = LinkInfo.new(up_id, down_id, weight)
       service.add_link(link.up_id, link.down_id, link.weight)
-      puts link.to_unix
+      output link.to_unix
     end
   end
 
   class UnlinkCommand < Command
     def run
       up_id, down_id = argv
-      up_id  = ShardId.parse(up_id)
-      down_id  = ShardId.parse(down_id)
+      up_id = ShardId.parse(up_id)
+      down_id = ShardId.parse(down_id)
       service.remove_link(up_id, down_id)
     end
   end
@@ -128,14 +143,14 @@ module Gizzard
       shard_ids = argv
       help! "No shards specified" if shard_ids.empty?
       shard_ids.each do |shard_id_string|
-        shard_id   = ShardId.parse(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|
             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)
             service.remove_link(downlink.up_id, downlink.down_id)
-            puts new_link.to_unix
+            output new_link.to_unix
           end
         end
         service.delete_shard shard_id
@@ -152,7 +167,7 @@ module Gizzard
       destination_type = command_options.destination_type || ""
       service.create_shard(ShardInfo.new(shard_id = ShardId.new(host, table), class_name, source_type, destination_type, busy))
       service.get_shard(shard_id)
-      puts shard_id.to_unix
+      output shard_id.to_unix
     end
   end
 
@@ -162,10 +177,10 @@ module Gizzard
       shard_ids.each do |shard_id_text|
         shard_id = ShardId.parse(shard_id_text)
         service.list_upward_links(shard_id).each do |link_info|
-          puts link_info.to_unix
+          output link_info.to_unix
         end
         service.list_downward_links(shard_id).each do |link_info|
-          puts link_info.to_unix
+          output link_info.to_unix
         end
       end
     end
@@ -176,7 +191,7 @@ module Gizzard
       shard_ids = @argv
       shard_ids.each do |shard_id|
         shard_info = service.get_shard(ShardId.parse(shard_id))
-        puts shard_info.to_unix
+        output shard_info.to_unix
       end
     end
   end
@@ -203,7 +218,7 @@ module Gizzard
             service.remove_link(link_info.up_id, link_info.down_id)
           end
         end
-        puts wrapper_id.to_unix
+        output wrapper_id.to_unix
       end
     end
   end
@@ -213,8 +228,17 @@ module Gizzard
       help!("host is a required option") unless command_options.shard_host
       service.shards_for_hostname(command_options.shard_host).each do |shard|
         next if command_options.shard_type && shard.class_name !~ Regexp.new(command_options.shard_type)
-        puts shard.id.to_unix
+        output shard.id.to_unix
       end
     end
   end
-end
+
+  class LookupCommand < Command
+    def run
+      table_id, source_id = @argv
+      help!("Requires table id and source id") unless table_id && source_id
+      shard = service.find_current_forwarding(table_id.to_i, source_id.to_i)
+      output shard.id.to_unix
+    end
+  end
+end

data/lib/gizzard/thrift.rb

@@ -22,9 +22,9 @@ module Gizzard
       def inspect
         "#{hostname}/#{table_prefix}"
       end
-      
+
       alias_method :to_unix, :inspect
-      
+
       def self.parse(string)
         new(*string.split("/"))
       end
@@ -46,7 +46,7 @@ module Gizzard
       def inspect(short = false)
         "#{id.inspect}" + (busy? ? " (BUSY)" : "")
       end
-      
+
       def to_unix
         [id.to_unix, class_name, busy? ? "busy" : "unbusy"].join("\t")
       end
@@ -62,11 +62,10 @@ module Gizzard
       def inspect
         "#{up_id.inspect} -> #{down_id.inspect}" + (weight == 1 ? "" : " <#{weight}>")
       end
-      
+
       def to_unix
         [up_id.to_unix, down_id.to_unix, weight].join("\t")
       end
-      
     end
 
     ShardMigration = T.make_struct(:ShardMigration,
@@ -97,11 +96,11 @@ module Gizzard
           STDERR.puts "Error opening log file at #{log_path}.  Continuing..."
         end
       end
-      
+
       def _proxy(method_name, *args)
         cls = self.class.ancestors.find { |cls| cls.respond_to?(:_arg_structs) and cls._arg_structs[method_name.to_sym] }
         arg_class, rv_class = cls._arg_structs[method_name.to_sym]
-        
+
         # Writing methods return void. Methods should never both read and write. If this assumption
         # is violated in the future, dry-run will fail!!
         is_writing_method = rv_class._fields.first.type == ThriftClient::Simple::VOID
@@ -118,13 +117,13 @@ module Gizzard
           raise
         end
       end
-      
+
       def printable(method_name, args, timestamp = false)
         ts = timestamp ? "#{Time.now}\t" : ""
         "#{ts}#{method_name}(#{args.map{|a| a.inspect}.join(', ')})"
       end
-      
-      
+
+
       thrift_method :create_shard, void, field(:shard, struct(ShardInfo), 1), :throws => exception(ShardException)
       thrift_method :delete_shard, void, field(:id, struct(ShardId), 1)
       thrift_method :get_shard, struct(ShardInfo), field(:id, struct(ShardId), 1)

data/lib/gizzmo.rb

@@ -10,6 +10,7 @@ ORIGINAL_ARGV = ARGV.dup
 
 # Container for parsed options
 global_options     = OpenStruct.new
+global_options.render = []
 subcommand_options = OpenStruct.new
 
 # Leftover arguments
@@ -51,7 +52,7 @@ subcommands = {
   end,
   'forwardings' => OptionParser.new do |opts|
     opts.banner = "Usage: #{$0} show [options]"
-  
+
     opts.on("-t", "--tables=IDS", "Show only the specified table ids (comma separated)") do |table_ids|
       subcommand_options.table_ids ||= []
       subcommand_options.table_ids +=  table_ids.split(",").map { |s| s.to_i }
@@ -85,6 +86,9 @@ subcommands = {
   end,
   'unlink' => OptionParser.new do |opts|
     opts.banner = "Usage: #{$0} unlink PARENT_SHARD_ID CHILD_SHARD_ID"
+  end,
+  'lookup' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{$0} lookup TABLE_ID SOURCE_ID"
   end
 }
 
@@ -107,6 +111,14 @@ global = OptionParser.new do |opts|
   opts.on("-P", "--port=PORT", "PORT of remote thrift service") do |port|
     global_options.port = port
   end
+  
+  opts.on("--subtree", "Render in subtree mode") do
+    global_options.render << "subtree"
+  end
+  
+  opts.on("--info", "Render in info mode") do
+    global_options.render << "info"
+  end
 
   opts.on("-D", "--dry-run", "") do |port|
     global_options.dry = true
@@ -121,7 +133,7 @@ global = OptionParser.new do |opts|
   opts.on("-L", "--log=LOG_FILE", "Path to LOG_FILE") do |file|
     global_options.log = file
   end
-  
+
   opts.on("-f", "--force", "Don't display confirmation dialogs") do |force|
     global_options.force = force
   end

data/test/expected/subtree-info.txt

@@ -0,0 +1,33 @@
+localhost/table_repl_0	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_a_0	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/replicating_table_b_0	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_b_0	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_repl_1	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_a_1	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_b_1	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_repl_2	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_a_2	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_b_2	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_repl_3	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_a_3	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_b_3	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_repl_4	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_a_4	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_b_4	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_repl_5	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_a_5	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_b_5	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_repl_6	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_a_6	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_b_6	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_repl_7	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_a_7	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_b_7	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_repl_8	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_a_8	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_b_8	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_repl_9	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_a_9	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/table_b_9	com.twitter.service.flock.edges.SqlShard	unbusy
+localhost/replicating_table_b_0	com.twitter.service.flock.edges.ReplicatingShard	unbusy
+localhost/table_b_0	com.twitter.service.flock.edges.SqlShard	unbusy

data/test/test.sh

@@ -9,6 +9,11 @@ function expect {
   diff -u - "expected/$1" && echo "    success." || echo "    failed." && exit 1
 }
 
+function expect-string {
+  echo "$1" > expected/tmp
+  expect tmp
+}
+
 g find -hlocalhost | xargs ../bin/gizzmo -Cconfig.yaml delete
 g find -hlocalhost | expect empty-file.txt
 
@@ -25,9 +30,17 @@ for i in `g find -h localhost`; do g info $i; done | expect info.txt
 g find -hlocalhost | expect original-find.txt
 g find -hlocalhost -tSqlShard | expect find-only-sql-shard-type.txt
 
-g addforwarding 1 0 localhost/table_a_3
-g forwardings | expect forwardings.txt
-g unforward 1 0 localhost/table_a_3
+
+NOW=`date +%s` # unix timestamp
+g addforwarding 13 $NOW localhost/table_a_3
+
+g forwardings | egrep "13.$NOW.localhost/table_a_3" 
+if [ $? -ne 0 ]; then
+  echo "    failed."
+  exit 1
+fi
+
+# g unforward 1 0 localhost/table_a_3
 
 g -D wrap com.twitter.service.flock.edges.ReplicatingShard localhost/table_b_0 | expect dry-wrap-table_b_0.txt
 g wrap com.twitter.service.flock.edges.ReplicatingShard localhost/table_b_0 | expect wrap-table_b_0.txt
@@ -36,6 +49,10 @@ g links localhost/table_b_0 | expect links-for-table_b_0.txt
 g links localhost/table_repl_0 | expect links-for-table_repl_0.txt
 g links localhost/replicating_table_b_0 | expect links-for-replicating_table_b_0.txt
 
+g --subtree --info find -Hlocalhost | expect subtree-info.txt
+
+g lookup 1 100 | expect-string "localhost/forward_1"
+
 g unwrap localhost/replicating_table_b_0 | expect unwrapped-replicating_table_b_0.txt
 g links localhost/table_b_0 | expect unwrapped-table_b_0.txt
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -07:00
+date: 2010-07-09 00:00:00 -07:00
 default_executable: gizzmo
 dependencies: []
 
@@ -52,6 +52,7 @@ files:
 - test/expected/links-for-table_b_0.txt
 - test/expected/links-for-table_repl_0.txt
 - test/expected/original-find.txt
+- test/expected/subtree-info.txt
 - test/expected/subtree.txt
 - test/expected/unwrapped-replicating_table_b_0.txt
 - test/expected/unwrapped-table_b_0.txt