gizzmo 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/gizzmo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gizzmo}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]

data/lib/gizzard/commands.rb

@@ -229,6 +229,28 @@ module Gizzard
       end
     end
   end
+  
+  class RepairCommand < ShardCommand
+    def run
+      args = @argv.dup.map{|a| a.split(/\s+/)}.flatten
+      pairs = []
+      loop do
+        a = args.shift
+        b = args.shift
+        break unless a && b
+        pairs << [a, b]
+      end
+      pairs.each do |master, slave|
+        puts "#{master} #{slave}"
+        mprefixes = service.shards_for_hostname(master).map{|s| s.id.table_prefix}
+        sprefixes = service.shards_for_hostname(slave).map{|s| s.id.table_prefix}
+        delta = mprefixes - sprefixes
+        delta.each do |prefix|
+          puts "gizzmo copy #{master}/#{prefix} #{slave}/#{prefix}"
+        end
+      end
+    end
+  end
 
   class WrapCommand < ShardCommand
     def self.derive_wrapper_shard_id(shard_info, wrapping_class_name)
@@ -267,12 +289,18 @@ module Gizzard
     end
 
     def run
+      puts command_options.inspect
+      additional_hosts = (command_options.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)
         memo[id.hostname] << id
         memo
       end
+      
+      additional_hosts.each do |host|
+        by_host[host] ||= NamedArray.new(host)
+      end
 
       sets = by_host.values
 
@@ -284,6 +312,7 @@ module Gizzard
       end while longest.length > shortest.length + 1
 
       shard_info = nil
+      puts sets.map{|l|l.length}.inspect
       sets.each do |set|
         host = set.name
         set.each do |id|
@@ -291,9 +320,8 @@ module Gizzard
             shard_info ||= service.get_shard(id)
             old = id.to_unix
             id.hostname = host
-            puts "gizzmo create #{shard_info.class_name} -s '#{shard_info.source_type}' -d '#{shard_info.destination_type}' #{old}"
+            puts "gizzmo create #{shard_info.class_name} -s '#{shard_info.source_type}' -d '#{shard_info.destination_type}' #{id.to_unix}"
             puts "gizzmo copy #{old} #{id.to_unix}"
-            puts "gizzmo delete #{old}"
           end
         end
       end

data/lib/gizzmo.rb

@@ -81,8 +81,16 @@ subcommands = {
     separators(opts, DOC_STRINGS["report"])
   end,
   'rebalance' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{zero} rebalance RUBY_REGEX"
+    opts.banner = "Usage: #{zero} rebalance"
     separators(opts, DOC_STRINGS["rebalance"])
+    
+    opts.on("-h", "--hosts=list") do |h|
+      subcommand_options.hosts = h
+    end
+  end,
+  'repair' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} repair MASTER SLAVE [MASTER SLAVE...]"
+    separators(opts, DOC_STRINGS["repair"])
   end,
   'pair' => OptionParser.new do |opts|
     opts.banner = "Usage: #{zero} pair"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Kyle Maxwell