flare-tools 0.4.5.1 → 0.5.0

data/lib/flare/tools/cli/option.rb

@@ -0,0 +1,55 @@
+require 'flare/entity/server'
+require 'flare/util/constant'
+
+module Flare; end
+module Flare::Tools; end
+module Flare::Tools::Cli; end
+module Flare::Tools::Cli::Option
+  include Flare::Util::Constant
+
+  attr_reader :optp
+
+  def option_init
+    @optp = OptionParser.new
+  end
+
+  def set_option_global
+    @optp.on('-h',        '--help',     "show this message") { puts @optp.help; exit 1 }
+    @optp.on(             '--debug',    "enable debug mode") { $DEBUG = true }
+    @optp.on(             '--warn',     "turn on warnings")  { $-w = true }
+    @optp.on(             '--log-file=LOGFILE',       "output log to LOGFILE") {|v| Flare::Util::Logging.set_logger(v)}
+
+    @timeout ||= DefaultTimeout
+    @optp.on(             '--timeout=SECOND',         "specify timeout") {|v| @timeout = v.to_i}
+  end
+
+  def set_option_index_server
+    @index_server_entity ||= Flare::Entity::Server.new(nil, nil)
+    @cluster ||= nil
+
+    @optp.on('-i HOSTNAME', '--index-server=HOSTNAME',  "index server hostname(default:#{DefaultIndexServerName})") {|v| @index_server_host = v}
+    @optp.on('-p PORT',     '--index-server-port=PORT', "index server port(default:#{DefaultIndexServerPort})") {|v| @index_server_port = v.to_i}
+    @optp.on(               '--cluster=NAME',           "specify a cluster name") {|v| @cluster = v}
+  end
+
+  def set_option_dry_run
+    @dry_run ||= false
+    @optp.on('-n',          '--dry-run',                "dry run") { @dry_run = true }
+  end
+
+  def set_option_force
+    @force ||= false
+    @optp.on('--force', "commit changes without confirmation") { @force = true }
+  end
+
+  def parse_options(config, argv)
+    begin
+      rest = @optp.parse(argv)
+    rescue OptionParser::ParseError => err
+      puts err.message
+      puts @optp.to_s
+      exit STATUS_NG
+    end
+    rest
+  end
+end

data/lib/flare/tools/cli/part.rb

@@ -11,6 +11,7 @@ require 'flare/util/constant'
 require 'flare/tools/cli/sub_command'
 require 'flare/tools/cli/slave'
 require 'flare/tools/cli/master'
+require 'flare/tools/cli/index_server_config'
 
 module Flare
   module Tools
@@ -19,14 +20,17 @@ module Flare
         include Flare::Util::Conversion
         include Flare::Util::Constant
         include Flare::Tools::Common
+        include Flare::Tools::Cli::IndexServerConfig
 
         myname :part
         desc   "set the master of a partition."
         usage  "master [hostname:port:balance:partition] ..."
 
-        def setup(opt)
-          opt.on('--force',          "commits changes without confirmation") {@force = true}
-          opt.on('--retry=COUNT',    "retry count"                         ) {|v| @retry = v.to_i}
+        def setup
+          super
+          set_option_index_server
+          set_option_force
+          @optp.on('--retry=COUNT',    "retry count"                         ) {|v| @retry = v.to_i}
         end
 
         def initialize
@@ -34,8 +38,9 @@ module Flare
           @force = false
           @retry = nil
         end
-  
-        def execute(config, *args)
+
+        def execute(config, args)
+          parse_index_server(config, args)
           return S_NG if args.size < 1
 
           hosts = args.map {|x| x.to_s.split(':')}
@@ -49,7 +54,7 @@ module Flare
           masters = []
           slaves = []
 
-          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], config[:timeout]) do |s|
+          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], @timeout) do |s|
             cluster = Flare::Tools::Cluster.new(s.host, s.port, s.stats_nodes)
 
             partitions = {}
@@ -71,24 +76,20 @@ module Flare
           begin
             opt = OptionParser.new
             subc = Flare::Tools::Cli::Master.new
-            subc.setup(opt)
             args = masters
             args << "--force" if @force
             args << "--activate"
-            opt.parse!(args)
-            subc.execute(config, *args)
+            subc.execute_subcommand(config, args)
           end
 
           puts "slaves:"
           begin
             opt = OptionParser.new
             subc = Flare::Tools::Cli::Slave.new
-            subc.setup(opt)
             args = slaves
             args << "--force" if @force
             args << "--retry=#{@retry}" unless @retry.nil?
-            opt.parse!(args)
-            subc.execute(config, *args)
+            subc.execute_subcommand(config, args)
           end
 
           S_OK

data/lib/flare/tools/cli/ping.rb

@@ -8,31 +8,29 @@ require 'flare/util/conversion'
 require 'flare/util/logging'
 require 'flare/tools/cli/sub_command'
 
-# 
 module Flare
   module Tools
 
-    # == Description
-    # 
     module Cli
       class Ping < SubCommand
         include Flare::Util::Conversion
         include Flare::Util::Logging
-        
+
         myname :ping
         desc   "ping"
         usage  "ping [hostname:port] ..."
-        
-        def setup(opt)
-          opt.on('--wait',            "wait for OK responses from nodes") {@wait = true}
+
+        def setup
+          super
+          @optp.on('--wait',            "wait for OK responses from nodes") {@wait = true}
         end
-        
+
         def initialize
           super
           @wait = false
         end
-        
-        def execute(config, *args)
+
+        def execute(config, args)
 
           hosts = args.map do |arg|
             hostname, port, rest = arg.split(':', 3)
@@ -55,7 +53,7 @@ module Flare
               begin
                 debug "trying..."
                 interruptible do
-                  Flare::Tools::Stats.open(hostname, port, config[:timeout]) do |s|
+                  Flare::Tools::Stats.open(hostname, port, @timeout) do |s|
                     resp = s.ping
                   end
                 end
@@ -70,11 +68,11 @@ module Flare
               end
             end
           end
-          
+
           puts "alive"
           S_OK
         end
-        
+
       end
     end
   end

data/lib/flare/tools/cli/reconstruct.rb

@@ -11,6 +11,7 @@ require 'flare/tools/common'
 require 'flare/util/conversion'
 require 'flare/util/constant'
 require 'flare/tools/cli/sub_command'
+require 'flare/tools/cli/index_server_config'
 
 module Flare
   module Tools
@@ -19,16 +20,20 @@ module Flare
         include Flare::Util::Conversion
         include Flare::Util::Constant
         include Flare::Tools::Common
-        
+        include Flare::Tools::Cli::IndexServerConfig
+
         myname :reconstruct
         desc "reconstruct the database of nodes by copying."
         usage "reconstruct [hostname:port] ..."
 
-        def setup(opt)
-          opt.on('--force',          "commit changes without confirmation"    ) {@force = true}
-          opt.on('--safe',           "reconstruct a node safely"              ) {@safe = true}
-          opt.on('--retry=COUNT',    "specify retry count (default:#{@retry})") {|v| @retry = v.to_i}
-          opt.on('--all',            "reconstruct all nodes"                  ) {@all = true}
+        def setup
+          super
+          set_option_index_server
+          set_option_dry_run
+          set_option_force
+          @optp.on('--safe',           "reconstruct a node safely"              ) {@safe = true}
+          @optp.on('--retry=COUNT',    "specify retry count (default:#{@retry})") {|v| @retry = v.to_i}
+          @optp.on('--all',            "reconstruct all nodes"                  ) {@all = true}
         end
 
         def initialize
@@ -39,13 +44,15 @@ module Flare
           @all = false
         end
 
-        def execute(config, *args)
+        def execute(config, args)
+          parse_index_server(config, args)
+
           if @all
             unless args.empty?
               puts "don't specify any nodes with --all option."
               return S_NG
             else
-              Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], config[:timeout]) do |s|
+              Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], @timeout) do |s|
                 cluster = Flare::Tools::Cluster.new(s.host, s.port, s.stats_nodes)
                 args = cluster.master_and_slave_nodekeys
               end
@@ -61,16 +68,16 @@ module Flare
               return S_NG
             end
           end
-          
+
           status = S_OK
 
-          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], config[:timeout]) do |s|
+          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], @timeout) do |s|
             puts string_of_nodelist(s.stats_nodes, hosts.map {|x| nodekey_of(x[0], x[1])})
 
             hosts.each do |hostname,port|
               nodekey = nodekey_of hostname, port
               cluster = Flare::Tools::Cluster.new(s.host, s.port, s.stats_nodes)
-              
+
               unless node = cluster.node_stat(nodekey)
                 puts "#{nodekey} is not found in this cluster."
                 return S_NG
@@ -111,14 +118,14 @@ module Flare
                   end
                 end
               end
-              if exec && !config[:dry_run]
+              if exec && !@dry_run
                 puts "turning down..."
                 s.set_state(hostname, port, 'down')
 
                 puts "waiting for node to be active again..."
                 sleep 3
 
-                Flare::Tools::Node.open(hostname, port, config[:timeout]) do |n|
+                Flare::Tools::Node.open(hostname, port, @timeout) do |n|
                   n.flush_all
                 end
 
@@ -137,7 +144,7 @@ module Flare
                 end
                 balance = node['balance']
                 if resp
-                  wait_for_slave_construction(s, nodekey, config[:timeout])
+                  wait_for_slave_construction(s, nodekey, @timeout)
                   unless @force
                     print "changing node's balance (node=#{nodekey}, balance=0 -> #{balance}) (y/n): "
                     exec = interruptible {(gets.chomp.upcase == "Y")}
@@ -154,7 +161,7 @@ module Flare
 
             puts string_of_nodelist(s.stats_nodes, hosts.map {|x| "#{x[0]}:#{x[1]}"})
           end # open
-          
+
           status
         end # execute()
 

data/lib/flare/tools/cli/remove.rb

@@ -7,27 +7,29 @@ require 'flare/tools/index_server'
 require 'flare/util/conversion'
 require 'flare/tools/common'
 require 'flare/tools/cli/sub_command'
+require 'flare/tools/cli/index_server_config'
 
-# 
 module Flare
   module Tools
     module Cli
 
-      # == Description
-      # 
       class Remove < SubCommand
         include Flare::Util::Conversion
         include Flare::Tools::Common
+        include Flare::Tools::Cli::IndexServerConfig
 
         myname :remove
         desc   "remove a node. (experimental)"
         usage  "remove"
-  
-        def setup(opt)
-          opt.on('--force',          "commit changes without confirmation")                  {@force = true}
-          opt.on('--wait=SECOND',    "specify the time to wait node for getting ready (default:#{@wait})") {|v| @wait = v.to_i}
-          opt.on('--retry=COUNT',    "retry count(default:#{@retry})")                        {|v| @retry = v.to_i}
-          opt.on('--connection-threshold=[COUNT]', "specify connection threashold (default:#{@connection_threshold})") {|v| @connection_threshold = v.to_i}
+
+        def setup
+          super
+          set_option_index_server
+          set_option_dry_run
+          set_option_force
+          @optp.on('--wait=SECOND',    "specify the time to wait node for getting ready (default:#{@wait})") {|v| @wait = v.to_i}
+          @optp.on('--retry=COUNT',    "retry count(default:#{@retry})")                        {|v| @retry = v.to_i}
+          @optp.on('--connection-threshold=[COUNT]', "specify connection threashold (default:#{@connection_threshold})") {|v| @connection_threshold = v.to_i}
         end
 
         def initialize
@@ -38,7 +40,9 @@ module Flare
           @connection_threshold = 2
         end
 
-        def execute(config, *args)
+        def execute(config, args)
+          parse_index_server(config, args)
+
           hosts = args.map {|x| x.split(':')}
           hosts.each do |x|
             if x.size != 2
@@ -46,8 +50,8 @@ module Flare
               return S_NG
             end
           end
-          
-          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], config[:timeout]) do |s|
+
+          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], @timeout) do |s|
             cluster = fetch_cluster(s)
 
             hosts.each do |hostname,port|
@@ -60,7 +64,7 @@ module Flare
 
             hosts.each do |hostname,port|
               exec = false
-              Flare::Tools::Node.open(hostname, port, config[:timeout]) do |n|
+              Flare::Tools::Node.open(hostname, port, @timeout) do |n|
                 nwait = @wait
                 node = n.stats
                 cluster = Flare::Tools::Cluster.new(s.host, s.port, s.stats_nodes)
@@ -87,14 +91,14 @@ module Flare
                   }
                 end
               end
-              
+
               if exec
                 suc = false
                 nretry = @retry
                 while nretry > 0
                   resp = false
                   info "removing #{hostname}:#{port}."
-                  resp = s.node_remove(hostname, port) unless config[:dry_run]
+                  resp = s.node_remove(hostname, port) unless @dry_run
                   if resp
                     suc = true
                     break
@@ -109,10 +113,9 @@ module Flare
             end
             puts string_of_nodelist(s.stats_nodes)
           end
-          
+
           S_OK
         end
-        
       end
     end
   end

data/lib/flare/tools/cli/restore.rb

@@ -20,7 +20,7 @@ end
 module Flare
   module Tools
     module Cli
-      
+
       class Restore < SubCommand
 
         class Restorer
@@ -70,35 +70,37 @@ module Flare
         include Flare::Util::Conversion
         include Flare::Util::Constant
         include Flare::Tools::Common
-        
+
         myname :restore
         desc   "restore data to nodes. (experimental)"
         usage  "restore [hostname:port]"
-        
-        def setup(opt)
-          opt.on('-i', '--input=FILE',             "input from file") {|v| @input = v}
-          opt.on('-f', '--format=FORMAT',          "input format [#{Formats.join(',')}]") {|v|
+
+        def setup
+          super
+          set_option_dry_run
+          @optp.on('-i', '--input=FILE',             "input from file") {|v| @input = v}
+          @optp.on('-f', '--format=FORMAT',          "input format [#{Formats.join(',')}]") {|v|
             @format = v
           }
-          opt.on('--bwlimit=BANDWIDTH',            "bandwidth limit (bps)") {|v| @bwlimit = v}
-          opt.on('--include=PATTERN',              "include pattern") {|v|
+          @optp.on('--bwlimit=BANDWIDTH',            "bandwidth limit (bps)") {|v| @bwlimit = v}
+          @optp.on('--include=PATTERN',              "include pattern") {|v|
             begin
               @include = Regexp.new(v)
             rescue RegexpError => e
               raise "#{v} isn't a valid regular expression."
             end
           }
-          opt.on('--prefix-include=STRING',        "prefix string") {|v|
+          @optp.on('--prefix-include=STRING',        "prefix string") {|v|
             @prefix_include = Regexp.new("^"+Regexp.escape(v))
-          }          
-          opt.on('--exclude=PATTERN',              "exclude pattern") {|v|
+          }
+          @optp.on('--exclude=PATTERN',              "exclude pattern") {|v|
             begin
               @exclude = Regexp.new(v)
             rescue RegexpError => e
               raise "#{v} isn't a valid regular expression."
             end
           }
-          opt.on('--print-keys',                     "enables key dump to console") {@print_key = true}
+          @optp.on('--print-keys',                     "enables key dump to console") {@print_key = true}
         end
 
         def initialize
@@ -115,16 +117,14 @@ module Flare
           @print_key = false
         end
 
-        def execute(config, *args)
+        def execute(config, args)
           STDERR.puts "please install tokyocabinet via gem command." unless defined? TokyoCabinet
 
-          dry_run = config[:dry_run]
-
           unless @format.nil? || Formats.include?(@format)
             STDERR.puts "unknown format: #{@format}"
             return S_NG
           end
-          
+
           if @prefix_include
             if @include
               STDERR.puts "--include option is specified."
@@ -140,7 +140,7 @@ module Flare
               return S_NG
             end
           end
-          
+
           restorer = case @format
                      when TchRestorer.myname
                        TchRestorer.new(@input)
@@ -149,7 +149,7 @@ module Flare
                      end
 
           nodes = hosts.map do |hostname,port|
-            Flare::Tools::Node.open(hostname, port.to_i, config[:timeout], @bwlimit, @bwlimit)
+            Flare::Tools::Node.open(hostname, port.to_i, @timeout, @bwlimit, @bwlimit)
           end
 
           count = 0
@@ -157,7 +157,7 @@ module Flare
             if @include.nil? || @include =~ key
               next if @exclude && @exclude =~ key
               STDOUT.puts key if @print_key
-              nodes[0].set(key, data, flag, expire) unless dry_run
+              nodes[0].set(key, data, flag, expire) unless @dry_run
               count += 1
             end
           end
@@ -168,7 +168,7 @@ module Flare
           end
 
           restorer.close
-          
+
           S_OK
         end # execute()