flare-tools 0.4.5.1 → 0.5.0

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

@@ -3,79 +3,23 @@
 # Copyright:: Copyright (C) GREE, Inc. 2011.
 # License::   MIT-style
 
-require 'optparse'
-require 'flare/util/logging'
-require 'flare/util/constant'
-require 'flare/tools'
-require 'flare/tools/cli'
-require 'flare/tools/cli/cli_util'
-
-require 'flare/util/command_line'
-
-Version = Flare::Tools::VERSION
-include Flare::Util::Logging
-include Flare::Util::Constant
-include Flare::Tools::Cli::CliUtil
-Cli = Flare::Tools::Cli
-
-index_server_hostname = nil
-index_server_port = nil
-timeout = DefaultTimeout
-dry_run = false
-cluster = nil
-scname = ''
-subc = nil
-
-scclasses = [Cli::List, Cli::Balance, Cli::Down, Cli::Slave, Cli::Reconstruct, Cli::Master, Cli::Threads, Cli::Ping, Cli::Remove, Cli::Index, Cli::Activate, Cli::Dump, Cli::Dumpkey, Cli::Verify, Cli::Stats, Cli::Restore, Cli::Summary]
-unsupported = [Cli::Deploy]
-scclasses.concat unsupported
-
-subcommands = Hash[*scclasses.map {|x| [x.to_sym, x]}.flatten]
-
-setup do |opt|
-  opt.banner = "#{Flare::Tools::TITLE}\nUsage: flare-admin [subcommand] [options] [arguments]"
-  opt.on("-n",           '--dry-run',                "dry run")                                                  {dry_run = true}
-  opt.on("-i HOSTNAME",  '--index-server=HOSTNAME',  "index server hostname(default:#{DefaultIndexServerName})") {|v| index_server_hostname = v}
-  opt.on("-p PORT",      '--index-server-port=PORT', "index server port(default:#{DefaultIndexServerPort})")     {|v| index_server_port = v.to_i}
-  opt.on(                '--log-file=LOGFILE',       "output log to LOGFILE")                                    {|v| Flare::Util::Logging.set_logger(v)}
-  opt.on(                '--cluster=NAME',           "specify a cluster name")                                   {|v| cluster = v}
-  opt.on(                '--timeout=SECOND',         "specify timeout")                                          {|v| timeout = v.to_i}
-  
-  preparsed = opt.order(ARGV)
-  scname = preparsed.shift.to_sym if preparsed.size > 0
-  
-  if subcommands.include?(scname)
-    subc = subcommands[scname].new 
-    opt.separator("#{scname} subcommand:")
-    subc.setup(opt)
-  else
-    error "unknown subcommand '#{scname}'" unless scname == ''
-    opt.separator("subcommands:")
-    puts opt.help
-    subcommands.each do |k,v|
-      next if unsupported.include?(v)
-      o = OptionParser.new
-      o.banner = "[#{k.to_s}] "+v.desc
-      o.separator("  Usage: flare-admin "+v.usage)
-      v.new.setup(o)
-      puts o.help
-    end
-    exit 1
+require 'flare/tools/cli/dispatch'
+
+module Flare; end
+module Flare::Tools; end
+module Flare::Tools::Cli; end
+class Flare::Tools::Cli::FlareAdmin
+  def main
+    subcommand = ARGV[0]
+    argv = ARGV[1..-1]
+
+    # We should clear ARGV to use (Kernel#)gets.
+    # see also: http://stackoverflow.com/questions/1883925/kernelgets-attempts-to-read-file-instead-of-standard-input
+    ARGV.clear
+    exit Flare::Tools::Cli::Dispatch.new.main(subcommand, argv, true)
   end
 end
 
-status = execute do |args|
-  command = args.shift
-  ihostname, iport = get_index_server_from_nodekeys(args) ||
-    get_index_server_name_and_port(index_server_hostname, index_server_port)
-  ihostname, iport = get_index_server_from_cluster(cluster) unless cluster.nil?
-  subc.execute({ :command => command,
-                 :index_server_hostname => ihostname,
-                 :index_server_port => iport,
-                 :dry_run => dry_run,
-                 :timeout => timeout,
-                 :cluster => cluster },
-               *args) if subc
-end
 
-exit status
+# execute!
+Flare::Tools::Cli::FlareAdmin.new.main

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

@@ -3,58 +3,14 @@
 # Copyright:: Copyright (C) GREE, Inc. 2011.
 # License::   MIT-style
 
+require 'flare/tools/cli/dispatch'
+
 cliname = File.basename($PROGRAM_NAME)
 cliname[/flare-/] = ""
+argv = ARGV.dup
 
-require 'resolv'
-require 'flare/tools'
-require 'flare/tools/cli/cli_util'
-require 'flare/util/logging'
-begin
-  require "flare/tools/cli/#{cliname}"
-rescue LoadError
-  exit 1
-end
-require 'flare/util/command_line.rb'
-require 'flare/util/conversion.rb'
-
-include Flare::Util::Logging
-include Flare::Util::Constant
-include Flare::Tools::Cli::CliUtil
-
-index_server_hostname = nil
-index_server_port = nil
-timeout = DefaultTimeout
-dry_run = false
-cluster = nil
-
-if ENV.has_key? "FLARE_INDEX_SERVER"
-  h, p = ENV["FLARE_INDEX_SERVER"].split(':')
-  index_server_hostname = h unless h.nil?
-  index_server_port = p unless p.nil?
-end
-
-subc = eval "Flare::Tools::Cli::#{cliname.capitalize}.new"
-
-setup do |opt|
-  opt.banner = "#{Flare::Tools::TITLE}\nUsage: flare-#{cliname} [options]"
-  opt.on('-n',          '--dry-run',                "dry run") {dry_run = true}
-  opt.on('-i HOSTNAME', '--index-server=HOSTNAME',  "index server hostname(default:#{DefaultIndexServerName})") {|v| index_server_hostname = v}
-  opt.on('-p PORT',     '--index-server-port=PORT', "index server port(default:#{DefaultIndexServerPort})") {|v| index_server_port = v.to_i}
-  opt.on(               '--log-file=LOGFILE',       "output log to LOGFILE") {|v| Flare::Util::Logging.set_logger(v)}
-  opt.on(               '--cluster=NAME',           "specify a cluster name") {|v| cluster = v}
-
-  subc.setup(opt)
-end
+# We should clear ARGV to use (Kernel#)gets.
+# see also: http://stackoverflow.com/questions/1883925/kernelgets-attempts-to-read-file-instead-of-standard-input
+ARGV.clear
 
-execute do |args|
-  ihostname, iport = get_index_server_from_nodekeys(args) ||
-    get_index_server_name_and_port(index_server_hostname, index_server_port)
-  ihostname, iport = get_index_server_from_cluster(cluster) unless cluster.nil?
-  subc.execute({ :command => File.basename($PROGRAM_NAME),
-                 :index_server_hostname => ihostname,
-                 :index_server_port => iport,
-                 :dry_run => dry_run,
-                 :timeout => timeout },
-               *args)
-end
+Flare::Tools::Cli::Dispatch.new.main(cliname, argv, false)

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

@@ -8,30 +8,33 @@ require 'flare/tools/common'
 require 'flare/tools/cluster'
 require 'flare/tools/cli/sub_command'
 require 'flare/util/conversion'
+require 'flare/tools/cli/index_server_config'
 
 module Flare
   module Tools
     module Cli
       class Index < SubCommand
         include Flare::Util::Conversion
-        
+        include Flare::Tools::Cli::IndexServerConfig
+
         myname :index
         desc   "print the index XML document from a cluster information."
         usage  "index"
 
-        def setup(opt)
-          opt.on('--indexdb=URI',            "index database"        ) {|v| @indexdb = v}
-          opt.on('--output=FILE',            "output index to a file") {|v| @output = v}
+        def setup
+          super
+          set_option_index_server
+          @optp.on('--output=FILE',            "output index to a file") {|v| @output = v}
         end
 
         def initialize
           super
           @output = nil
-          @indexdb = nil
         end
 
-        def execute(config, *args)
-          cluster = Flare::Tools::Stats.open(config[:index_server_hostname], config[:index_server_port], config[:timeout]) do |s|
+        def execute(config, args)
+          parse_index_server(config, args)
+          cluster = Flare::Tools::Stats.open(config[:index_server_hostname], config[:index_server_port], @timeout) do |s|
             nodes = s.stats_nodes.sort_by{|key, val| [val['partition'], val['role'], key]}
             Flare::Tools::Cluster.new(s.host, s.port, s.stats_nodes)
           end

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

@@ -0,0 +1,94 @@
+require 'flare/tools/index_server'
+require 'flare/entity/server'
+require 'flare/util/logging'
+
+module Flare; end
+module Flare::Tools; end
+module Flare::Tools::Cli; end
+module Flare::Tools::Cli::IndexServerConfig
+  include Flare::Util::Constant
+  include Flare::Util::Logging
+  FLARE_INDEX_SERVERS = "FLARE_INDEX_SERVERS"
+  FLARE_INDEX_SERVER = "FLARE_INDEX_SERVER"
+  Entity = Flare::Entity
+
+  private
+
+  def parse_index_server(config, rest)
+    if @cluster
+      @index_server_entity = get_index_server_from_cluster(@cluster)
+    else
+      @index_server_entity =
+        get_index_server_from_nodekeys(rest) ||
+        get_index_server_name_and_port(Entity::Server.new(@index_server_host, @index_server_port))
+    end
+
+    return unless @index_server_entity
+
+    config[:index_server_hostname] = @index_server_entity.host
+    config[:index_server_port] = @index_server_entity.port
+  end
+
+  # @return [Flare::Entity::Server | nil]
+  def get_index_server_from_cluster(name, envname = FLARE_INDEX_SERVERS)
+    return nil if name.nil?
+    if ENV.has_key? envname
+      clusters = ENV[envname].split(';').map{|s| s.split(':')}
+      clusters.each do |cluster_name,index_name,index_port|
+        return Entity::Server.new(index_name, index_port) if cluster_name == name
+      end
+    end
+    return nil
+  end
+
+  # @return [Flare::Entity::Server | nil]
+  def get_index_server_from_nodekeys(dnodekeys, envname = FLARE_INDEX_SERVERS)
+    nodekeys = []
+    return nil if dnodekeys.empty?
+    dnodekeys.each do |n|
+      l = n.split(':')
+      return nil if l.size < 2
+      nodekeys << "#{l[0]}:#{l[1]}"
+    end
+    if ENV.has_key? envname
+      clusters = ENV[envname].split(';').map{|s| s.split(':')}
+      clusters.each do |cluster_name,index_name,index_port|
+        ret = Flare::Tools::IndexServer.open(index_name, index_port.to_i) do |s|
+          cluster_nodekeys = s.stats_nodes.map {|x| x[0]}
+          included = true
+          nodekeys.each do |nodekey|
+            included = false unless cluster_nodekeys.include? nodekey
+          end
+          if included
+            Entity::Server.new(index_name, index_port)
+          else
+            nil
+          end
+        end
+        return ret unless ret.nil?
+      end
+    end
+    nil
+  rescue => e
+    debug(e.message)
+    nil
+  end
+
+  # @param [Flare::Entity::Server] index_server
+  # @return [Flare::Entity::Server]
+  def get_index_server_name_and_port(index_server, envname = FLARE_INDEX_SERVER)
+    env_ihostname = nil
+    env_iport = nil
+    if ENV.has_key? envname
+      env_ihostname, env_iport = ENV[envname].split(':')
+    end
+    ihostname, iport = index_server.host.split(':') unless index_server.host.nil?
+    ihostname = ihostname || env_ihostname || DefaultIndexServerName
+    if iport && index_server.port
+      raise "--index-server-port option isn't allowed."
+    else
+      iport = index_server.port || env_iport || DefaultIndexServerPort if iport.nil?
+    end
+    Entity::Server.new(ihostname, iport)
+  end
+end

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

@@ -8,17 +8,16 @@ require 'flare/tools/cluster'
 require 'flare/tools/common'
 require 'flare/util/conversion'
 require 'flare/tools/cli/sub_command'
+require 'flare/tools/cli/index_server_config'
 
-# 
 module Flare
   module Tools
     module Cli
 
-      # == Description
-      # 
       class List < SubCommand
         include Flare::Util::Conversion
         include Flare::Tools::Common
+        include Flare::Tools::Cli::IndexServerConfig
 
         myname :list
         desc   "show the list of nodes in a flare cluster."
@@ -29,9 +28,11 @@ module Flare
                          ['%6s',   'role'],
                          ['%6s',   'state'],
                          ['%7s',   'balance'] ]
-  
-        def setup(opt)
-          opt.on('--numeric-hosts',            "show numerical host addresses") {@numeric_hosts = true}
+
+        def setup
+          super
+          set_option_index_server
+          @optp.on('--numeric-hosts',            "show numerical host addresses") {@numeric_hosts = true}
         end
 
         def initialize
@@ -50,7 +51,7 @@ module Flare
           @cout.puts @format % args
           nil
         end
-        
+
         def get_address_or_remain hostname
           begin
             Resolv.getaddress(hostname)
@@ -59,14 +60,15 @@ module Flare
           end
         end
 
-        def execute(config, *args)
+        def execute(config, args)
+          parse_index_server(config, args)
           if args.size > 0
             error "invalid arguments: "+args.join(' ')
             return S_NG
           end
-          
+
           cluster = Flare::Tools::IndexServer.open(config[:index_server_hostname],
-                                                   config[:index_server_port], config[:timeout]) do |s|
+                                                   config[:index_server_port], @timeout) do |s|
             Flare::Tools::Cluster.new(s.host, s.port, s.stats_nodes)
           end
 
@@ -74,7 +76,7 @@ module Flare
             error "Invalid index server."
             return S_NG
           end
-          
+
           print_header
           cluster.nodekeys.each do |nodekey|
             data = cluster.node_stat(nodekey)
@@ -86,7 +88,7 @@ module Flare
 
           S_OK
         end
-        
+
       end
     end
   end

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

@@ -10,6 +10,7 @@ require 'flare/tools/cluster'
 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
@@ -18,24 +19,30 @@ module Flare
         include Flare::Util::Conversion
         include Flare::Util::Constant
         include Flare::Tools::Common
+        include Flare::Tools::Cli::IndexServerConfig
 
         myname :master
         desc   "construct a partition with a proxy node for master role."
         usage  "master [hostname:port:balance:partition] ..."
 
-        def setup(opt)
-          opt.on('--force',          "commit changes without confirmation"     ) {@force = true}
-          opt.on('--retry=COUNT',    "specify retry count (default:#{@retry})" ) {|v| @retry = v.to_i}
-          opt.on('--activate',       "change node's state from ready to active") {@activate = true}
+        def setup
+          super
+          set_option_index_server
+          set_option_dry_run
+          set_option_force
+          @optp.on('--retry=COUNT',    "specify retry count (default:#{@retry})" ) {|v| @retry = v.to_i}
+          @optp.on('--activate',       "change node's state from ready to active") {@activate = true}
         end
 
         def initialize
+          super
           @force = false
           @retry = 10
           @activate = false
         end
-  
-        def execute(config, *args)
+
+        def execute(config, args)
+          parse_index_server(config, args)
           status = S_OK
 
           return S_NG if args.empty?
@@ -55,15 +62,15 @@ module Flare
             end
           end
           hosts = hosts.sort_by{|hostname,port,balance,partition| [partition]}
-          
-          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)
 
             hosts.each do |hostname,port,balance,partition|
               role = 'master'
               nodekey = nodekey_of hostname, port
               ipaddr = address_of_hostname(hostname)
-          
+
               unless cluster.has_nodekey? nodekey
                 error "unknown host: #{nodekey}"
                 # return S_NG
@@ -86,7 +93,7 @@ module Flare
                 STDERR.print "making the node master (node=#{ipaddr}:#{port}, role=#{node['role']} -> #{role}) (y/n): "
                 exec = interruptible {(gets.chomp.upcase == "Y")}
               end
-              if exec && !config[:dry_run]
+              if exec && !@dry_run
                 nretry = 0
                 resp = false
                 while resp == false && nretry < @retry
@@ -101,7 +108,7 @@ module Flare
                   end
                 end
                 if resp
-                  state = wait_for_master_construction(s, nodekey, config[:timeout])
+                  state = wait_for_master_construction(s, nodekey, @timeout)
                   if state == 'ready' && @activate
                     unless @force
                       node = s.stats_nodes[nodekey]
@@ -136,7 +143,6 @@ module Flare
 
           status
         end # execute()
-        
       end
     end
   end