ruster 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f9a02c2de8ff2db1cb8be0199803ce1d45b3e1a
-  data.tar.gz: d1781d3676d0c6a3d50de5ba720c7ce10fbae013
+  metadata.gz: c35baea7d1a295313170c4ef1345c6f22f872697
+  data.tar.gz: 76f8ba9ddf5ae1cf2cc5df865fe733770786fc21
 SHA512:
-  metadata.gz: b0244b61e5992f70e752b034913f0d5881c30f0b7da3a82d5758b2098798799675ce4f0a0a9a537aebca6d8412015ec20da677115c7f488e3882d4eb3bfb76d8
-  data.tar.gz: 5085f9a83289b4942f48e2ba8358b01de3f970abea481a8d007f48031415d39aa40070e33142301839727855ce642a553e1110830bd5d8125b0392aec82bc43e
+  metadata.gz: ef371dc30165f7284d3e0d1c1b250125320f675cc27391790195147f0ddd17d53b287ac130b10e23c1ffe48052fea74ca0cfebb641d4d0d0d86c5900ddf26609
+  data.tar.gz: d5c88f5c3cc8389231029ceea8a69153457056cc5c452eb1113b53a5c921d9d45d5df1b6dae60de1180b18fd0e0626aa78347a3f0ac765eb178f47010e6db5bf

data/README.md

@@ -44,7 +44,7 @@ node.
 ### Execute a command in all nodes
 
 ```
-$ ruster call ip:port [CMD ...]
+$ ruster each ip:port [CMD ...]
 ```
 
 Executes the [Redis command][redis-commands] in all nodes, displaying
@@ -59,6 +59,23 @@ $ ruster reshard cluster_ip:port slots target_ip:port source_ip:port [...]
 Reshards the cluster at `cluster_ip:port`, by moving `slots` slots
 from several `source_ip:port` to `target_ip:port`.
 
+It accepts the following parameters:
+
+* `-n` indicate destination DB (currently only `0` seem to be working)
+* `-t` indicate timeout for [`MIGRATE`][migrate] keys
+
+[migrate]: http://redis.io/commands/migrate
+
+### Global parameters
+
+`ruster` accepts the following global parameters:
+
+* `-v` verbose output. It could be used multiple times, to indicate
+  the level of verbosity.
+
+  1. display log messages
+  1. display Redis commands sent to the cluster
+
 ## TODO
 
 * documentation

data/bin/ruster

@@ -4,14 +4,42 @@ require "redic"
 require "clap"
 
 $verbose = 0
-$timeout = 10_000_000
 
-action, *args = Clap.run ARGV, {
-                                "-v" => ->     { $verbose += 1 },
-                                "-t" => ->(ms) { $timeout = ms }
-                              }
+action, *args = Clap.run ARGV, "-v" => -> { $verbose += 1 }
 
-abort "Usage: #{File.basename($0)} <action> ip:port [...]" if action.nil? or args.nil? or args.empty?
+USAGE = <<EOU
+Usage: #{File.basename($0)} [-v] <action> ip:port [...]
+
+Parameters
+
+  -v        Increases verbosity level. Can be used more than once.
+
+Actions
+
+  create    ip:port [ip:port...]
+            Creates a cluster with all the passed nodes
+
+  add       cluster_ip:port ip:port
+            Add node ip:port to the cluster at cluster_ip:port
+
+  remove    cluster_ip:port ip:port
+            Remove node from the cluster at cluster_ip:port
+            Note that currently removing a node that has assigned
+            slots breaks the cluster state.
+
+  each      cluster_ip:port CMD...
+            Execute Redis CMD in all nodes
+
+  reshard   cluster_ip:port slots target_ip:port source_ip:port...
+            Reshards `slots` slots into target_ip:port, taking slots
+            proportionally from all the nodes in source_ip:port
+
+            Accepts `-n n` to indicate a destination DB
+            Accepts `-t ms` to indicate timeout for keys migration
+
+EOU
+
+abort USAGE if action.nil? or args.nil? or args.empty?
 
 module UI
   def err msg
@@ -214,7 +242,7 @@ class Cluster
     end
   end
 
-  def call(*args)
+  def each(*args)
     nodes!.each do |node|
       UI.info "#{node}: #{args.join(' ')}"
 
@@ -224,7 +252,9 @@ class Cluster
     end
   end
 
-  def reshard(target_addr, slots, sources)
+  def reshard(target_addr, slots, sources, opts={})
+    options = { timeout: 1_000, db: 0 }.merge(opts)
+
     target = Node.new(target_addr)
 
     from = sources.map{ |addr| Node.new(addr) } \
@@ -234,6 +264,8 @@ class Cluster
       sum + source.slots[:slots].size
     end
 
+    UI.abort "No slots found to migrate" unless total_slots > 0
+
     from.each do |source|
       # Proportional number of slots, based on current assigned slots
       node_slots = (slots.to_f / total_slots * source.slots[:slots].size).to_i
@@ -241,7 +273,9 @@ class Cluster
       UI.info "Moving #{node_slots} slots from #{source} to #{target}"
 
       source.slots[:slots].take(node_slots).each do |slot|
-        UI.log "  Moving slot #{slot} from #{source} to #{target}"
+        count = source.call("CLUSTER", "COUNTKEYSINSLOT", slot)
+
+        UI.log "  Moving slot #{slot} (#{count} keys)"
 
         target.call("CLUSTER", "SETSLOT", slot, "IMPORTING", source.id)
         source.call("CLUSTER", "SETSLOT", slot, "MIGRATING", target.id)
@@ -254,9 +288,11 @@ class Cluster
           done = keys.empty?
 
           keys.each do |key|
-            res = source.call("MIGRATE", target.ip, target.port, key, 0, 5000)
+            res = source.call("MIGRATE", target.ip, target.port, key, options[:db], options[:timeout])
 
             UI.abort res.message if res.is_a?(RuntimeError)
+
+            $stdout.print '.' if $verbose > 2
           end
         end
 
@@ -287,22 +323,23 @@ begin
     args.each do |addr|
       cluster.remove_node(Node.new(addr))
     end
-  when "call"
+  when "each"
     cluster = Cluster.new(args.shift)
 
-    cluster.call(*args)
+    cluster.each(*args)
   when "reshard"
-    cluster = Cluster.new(args.shift)
-
-    slots = Integer(args.shift)
+    options = {}
 
-    target = args.shift
+    cluster_addr, slots, target_addr, *sources = Clap.run args, {
+      "-t" => ->(ms) { options[:timeout] = Integer(ms) },
+      "-n" => ->(db) { options[:db] = db }
+    }
 
-    sources = args
+    cluster = Cluster.new(cluster_addr)
 
-    cluster.reshard(target, slots, sources)
+    cluster.reshard(target_addr, slots, sources, options)
   else
-    UI.abort "Unrecognized action #{action}"
+    UI.abort "Unrecognized action `#{action}'\n#{USAGE}"
   end
 rescue => ex
   UI.abort ex.message, ex.backtrace

data/ruster.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = "ruster"
-  s.version           = "0.0.2"
+  s.version           = "0.0.3"
   s.summary           = "A simple Redis Cluster Administration tool"
   s.description       = "Control your Redis Cluster from the command line."
   s.authors           = ["Leandro López"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruster
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Leandro López