flare-tools 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 51a516a3ee2ee78de4e03ac77194243273ef4b97
+  data.tar.gz: 8e3c8e3cfcb570b6207c784f43c25882b4fe8d42
+SHA512:
+  metadata.gz: 6d5145f2207134f8fdac4574db9fecb08d34accbd2532be32528bf90c029b816d722a9392840364e4fe5a18fe108d18ee453f145fd40413f34153015f77cf23e
+  data.tar.gz: f8cc80b90393f36481cb8668076fc2c49bf2ca11994f589971a5dbc04aa4cf055739196a5e92aec25e4e84fcf002b41da5f105837cf29ea3589998398bd68038

data/.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 1.8.7
+  - 1.9.3
   - 2.0.0
-  - 2.1.3
+  - 2.1.5
 before_install:
   - travis_retry sudo apt-get update
   - travis_retry sudo apt-get install libtokyocabinet-dev
-  - travis_retry sudo apt-get install libboost-program-options-dev libboost-regex-dev libboost-serialization-dev libboost-thread-dev
+  - travis_retry sudo apt-get install libboost-program-options-dev libboost-regex-dev libboost-serialization-dev libboost-thread-dev libboost-system-dev
   - travis_retry sudo apt-get install uuid-dev
   - git clone https://github.com/gree/flare.git flare
   - (cd flare && ./autogen.sh)

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.7.0 / 2014-12-12
+* Major Enhancements
+  * Modify 'remove' subcommand behavior.
+    * Now flare-tools can remove a downed node.
+* Minor Enhancements
+  * Fixed sometimes stats command abort.
+  * Fixed flare-deploy command degraded
+
 === 0.6.0 / 2014-11-07
 * Minor Enhancements
   * Modify default options to safely

data/README.txt

@@ -101,7 +101,7 @@ Please see the stats subcommand section of flare-admin for further detail.
      -c, --count=[REPEATTIME]         repeat count
          --delimiter=[CHAR]           delimiter
 
-=== flare-stdmin
+=== flare-admin
 
 Flare-admin consists of a battery of subcommands used for maintaining a flare cluster.
 You must specify the hostname and port number of the index node by telling them as options 
@@ -305,12 +305,9 @@ subcommands:
         --quiet                      use quiet mode
 
 [remove] remove a node. (experimental)
-  Usage: flare-admin remove
+  Usage: flare-admin remove [hostname:port] ...
         --force                      commit changes without confirmation
-        --wait=[SECOND]              specify the time to wait node for getting ready (default:30)
-        --retry=[COUNT]              retry count(default:5)
-        --connection-threshold=[COUNT]
-                                     specify connection threashold (default:2)
+        --retry=COUNT                retry count(default:0)
 
 [dump] dump data from nodes. (experimental)
   Usage: flare-admin dump [hostname:port] ...

data/Tutorial.txt

@@ -42,13 +42,23 @@ You can find debian packages at http://labs.gree.jp/Top/OpenSource/Flare/Downloa
 
 == Installing flare-tools
 
-Flare-tools hasn't been published to the public gem repository yet, so please pull the 
-code from the git repository and type "rake install_gem" in your shell.
+=== Before install
 
- mynode1$ sudo gem install hoe newgem rdoc
- mynode1$ git clone ...
- mynode1$ cd flare-tools
- mynode1$ rake rake install_gem
+flare-tools and dependent gem packages require the libraries shown below.
+
+ - libtokyocabinet
+ - libbz2
+ - zlib
+
+You should install these libraries before installing flare-tools. For example, if you are using Debian / Ubuntu:
+
+ mynode1$ sudo apt-get install libtokyocabinet-dev libbz2-dev zlib1g-dev rubygems
+
+=== Install
+
+flare-tools is available on rubygems.
+
+ mynode1$ gem install flare-tools
 
 == Setting up your index server.
 

data/bin/flare-argv0

@@ -3,4 +3,19 @@
 
 $LOAD_PATH.unshift File.dirname(__FILE__)+"/../lib"
 
-require 'flare/tools/cli/flare_argv0.rb'
+require 'flare/tools/cli/dispatch'
+
+cliname = "deploy"
+argv = ARGV.dup
+
+# 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
+
+class Flare::Tools::Cli::DispatchWithDeploy < Flare::Tools::Cli::Dispatch
+  def initialize
+    super
+    @subcommands['deploy'] = Flare::Tools::Cli::Deploy
+  end
+end
+Flare::Tools::Cli::DispatchWithDeploy.new.main(cliname, argv, false)

data/bin/flare-deploy

@@ -3,4 +3,19 @@
 
 $LOAD_PATH.unshift File.dirname(__FILE__)+"/../lib"
 
-require 'flare/tools/cli/flare_argv0.rb'
+require 'flare/tools/cli/dispatch'
+
+cliname = "deploy"
+argv = ARGV.dup
+
+# 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
+
+class Flare::Tools::Cli::DispatchWithDeploy < Flare::Tools::Cli::Dispatch
+  def initialize
+    super
+    @subcommands['deploy'] = Flare::Tools::Cli::Deploy
+  end
+end
+Flare::Tools::Cli::DispatchWithDeploy.new.main(cliname, argv, false)

data/bin/flare-part

@@ -3,4 +3,19 @@
 
 $LOAD_PATH.unshift File.dirname(__FILE__)+"/../lib"
 
-require 'flare/tools/cli/flare_argv0.rb'
+require 'flare/tools/cli/dispatch'
+
+cliname = "deploy"
+argv = ARGV.dup
+
+# 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
+
+class Flare::Tools::Cli::DispatchWithDeploy < Flare::Tools::Cli::Dispatch
+  def initialize
+    super
+    @subcommands['deploy'] = Flare::Tools::Cli::Deploy
+  end
+end
+Flare::Tools::Cli::DispatchWithDeploy.new.main(cliname, argv, false)

data/bin/flare-ping

@@ -3,4 +3,19 @@
 
 $LOAD_PATH.unshift File.dirname(__FILE__)+"/../lib"
 
-require 'flare/tools/cli/flare_argv0.rb'
+require 'flare/tools/cli/dispatch'
+
+cliname = "deploy"
+argv = ARGV.dup
+
+# 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
+
+class Flare::Tools::Cli::DispatchWithDeploy < Flare::Tools::Cli::Dispatch
+  def initialize
+    super
+    @subcommands['deploy'] = Flare::Tools::Cli::Deploy
+  end
+end
+Flare::Tools::Cli::DispatchWithDeploy.new.main(cliname, argv, false)

data/bin/flare-stats

@@ -3,4 +3,19 @@
 
 $LOAD_PATH.unshift File.dirname(__FILE__)+"/../lib"
 
-require 'flare/tools/cli/flare_argv0.rb'
+require 'flare/tools/cli/dispatch'
+
+cliname = "deploy"
+argv = ARGV.dup
+
+# 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
+
+class Flare::Tools::Cli::DispatchWithDeploy < Flare::Tools::Cli::Dispatch
+  def initialize
+    super
+    @subcommands['deploy'] = Flare::Tools::Cli::Deploy
+  end
+end
+Flare::Tools::Cli::DispatchWithDeploy.new.main(cliname, argv, false)

data/lib/flare/cli/ask_node_remove.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8; -*-
+# Authors::   Yuya YAGUCHI <yuya.yaguchi@gree.net>
+# Copyright:: Copyright (C) GREE, Inc. 2014.
+# License::   MIT-style
+
+require 'flare/util/interruption'
+
+module Flare; end
+module Flare::Cli; end
+module Flare::Cli::AskNodeRemove
+
+  # @param [Flare::Entity::Server] server
+  # @param [Flare::Tools::Cluster::NodeStat] node_stat
+  # @return [Boolean] approved
+  def ask_node_remove(server, node_stat)
+    STDERR.print "remove the node from a cluster (node=#{server}, role=#{node_stat.role}, state=#{node_stat.state}) (y/n): "
+    interruptible {
+      STDIN.gets.chomp.upcase == "Y"
+    }
+  end
+
+end

data/lib/flare/cli/parse_host_port_pairs.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8; -*-
+# Authors::   Yuya YAGUCHI <yuya.yaguchi@gree.net>
+# Copyright:: Copyright (C) GREE, Inc. 2014.
+# License::   MIT-style
+
+require 'flare/entity/server'
+
+module Flare; end
+module Flare::Cli; end
+module Flare::Cli::ParseHostPortPairs
+  Entity = Flare::Entity
+
+  # @param [String] args
+  # @return [Array]    server entities
+  # @return [nil]
+  def parse_host_port_pairs(args)
+    servers = args.map {|x| x.split(':')}
+    servers.each do |x|
+      if x.size != 2
+        error "invalid argument '#{x.join(':')}'. it must be hostname:port."
+        return nil
+      end
+    end
+    servers.map do |s|
+      Entity::Server.new(s[0], s[1])
+    end
+  end
+
+end

data/lib/flare/entity/server.rb

@@ -2,6 +2,10 @@ module Flare; end
 module Flare::Entity; end
 class Flare::Entity::Server < Struct.new(:host, :port)
   def to_s
+    nodekey
+  end
+
+  def nodekey
     "#{self.host}:#{self.port}"
   end
 end

data/lib/flare/operation/node_remove.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8; -*-
+# Authors::   Yuya YAGUCHI <yuya.yaguchi@gree.net>
+# Copyright:: Copyright (C) GREE, Inc. 2014.
+# License::   MIT-style
+
+module Flare; end
+module Flare::Operation; end
+module Flare::Operation::NodeRemove
+
+  # @param [Flare::Tools::Cluster::NodeStat] node_stat
+  # @return [Boolean]
+  def node_can_remove_safely?(node_stat)
+    node_stat.proxy? && node_stat.down?
+  end
+
+  # @param [Flare::Tools::IndexServer] client  index server client
+  # @param [Flare::Entity::Server] server
+  # @param [Integer] retry_count
+  # @param [Boolean] dry_run
+  # @return [Boolean] succeeded
+  def node_remove(client, server, retry_count, dry_run)
+    (retry_count + 1).times do
+      resp = false
+      info "removing #{server}."
+      resp = client.node_remove(server.host, server.port) unless dry_run
+      if resp
+        return true
+      end
+    end
+    return false
+  end
+
+end

data/lib/flare/test/cluster.rb

@@ -73,12 +73,17 @@ module Flare
         node = @nodes[hostname_port] = Node.new(hostname_port, pid)
         node
       end
-      
+
       def shutdown
         daemon = Daemon.instance
         daemon.shutdown
       end
 
+      def shutdown_node(node)
+        daemon = Daemon.instance
+        daemon.shutdown_flared(node.pid)
+      end
+
       def nodes
         @nodes.values
       end

data/lib/flare/test/daemon.rb

@@ -36,19 +36,7 @@ module Flare
       def shutdown
         STDERR.print "killing..."
         (@flared+@flarei).each do |pid|
-          STDERR.print " #{pid}"
-          begin
-            timeout(10) do
-              Process.kill :TERM, pid
-              Process.waitpid pid
-            end
-          rescue Errno::ESRCH
-            STDERR.print "?"
-          rescue TimeoutError => e
-            Process.kill :KILL, pid
-            Process.waitpid pid
-            STDERR.print "*"
-          end
+          kill_node_process(pid)
         end
         STDERR.print "\n"
         Process.waitall
@@ -126,6 +114,16 @@ module Flare
         pid
       end
 
+      def shutdown_flared(target_pid)
+        STDERR.print "killing node..."
+        @flared.each_with_index do |pid, i|
+          next unless pid == target_pid
+          kill_node_process(pid)
+        end
+        STDERR.print "\n"
+        @flared.delete(target_pid)
+      end
+
       def deleteall(delthem)
         return unless FileTest.exist?(delthem)
         if FileTest.directory?(delthem)
@@ -139,6 +137,24 @@ module Flare
         end
       end
 
+      private
+
+      def kill_node_process(pid)
+        STDERR.print " #{pid}"
+        begin
+          timeout(10) do
+            Process.kill :TERM, pid
+            Process.waitpid pid
+          end
+        rescue Errno::ESRCH
+          STDERR.print "?"
+        rescue TimeoutError => e
+          Process.kill :KILL, pid
+          Process.waitpid pid
+          STDERR.print "*"
+        end
+      end
+
     end
   end
 end

data/lib/flare/test/node.rb

@@ -56,7 +56,7 @@ module Flare
         @alive = false
       end
 
-      attr_reader :hostname, :port, :hostname_port
+      attr_reader :hostname, :port, :hostname_port, :pid
     end
   end
 end

data/lib/flare/tools.rb

@@ -9,7 +9,7 @@ module Flare
   # flare-tools module.
   module Tools
     # the version number of flare-tools
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
     TITLE = "Flare-tools version #{VERSION} Copyright (C) GREE, Inc. 2011-2014"
     autoload :Common,      'flare/tools/common'
     autoload :Cluster,     'flare/tools/cluster'

data/lib/flare/tools/cli.rb

@@ -3,29 +3,28 @@
 # Copyright:: Copyright (C) GREE, Inc. 2011.
 # License::   MIT-style
 
-# 
 module Flare
   module Tools
     module Cli
-      autoload :List,        'flare/tools/cli/list'
-      autoload :Stats,       'flare/tools/cli/stats'
-      autoload :Index,       'flare/tools/cli/index'
+      autoload :Activate,    'flare/tools/cli/activate'
       autoload :Balance,     'flare/tools/cli/balance'
+      autoload :Deploy,      'flare/tools/cli/deploy'
       autoload :Down,        'flare/tools/cli/down'
-      autoload :Slave,       'flare/tools/cli/slave'
-      autoload :Reconstruct, 'flare/tools/cli/reconstruct'
+      autoload :Dump,        'flare/tools/cli/dump'
+      autoload :Dumpkey,     'flare/tools/cli/dumpkey'
+      autoload :Index,       'flare/tools/cli/index'
+      autoload :List,        'flare/tools/cli/list'
       autoload :Master,      'flare/tools/cli/master'
-      autoload :Deploy,      'flare/tools/cli/deploy'
-      autoload :Threads,     'flare/tools/cli/threads'
+      autoload :Part,        'flare/tools/cli/part'
       autoload :Ping,        'flare/tools/cli/ping'
+      autoload :Reconstruct, 'flare/tools/cli/reconstruct'
       autoload :Remove,      'flare/tools/cli/remove'
-      autoload :Activate,    'flare/tools/cli/activate'
-      autoload :Dump,        'flare/tools/cli/dump'
-      autoload :Dumpkey,     'flare/tools/cli/dumpkey'
-      autoload :Verify,      'flare/tools/cli/verify'
       autoload :Restore,     'flare/tools/cli/restore'
+      autoload :Slave,       'flare/tools/cli/slave'
+      autoload :Stats,       'flare/tools/cli/stats'
       autoload :Summary,     'flare/tools/cli/summary'
-      autoload :Part,        'flare/tools/cli/part'
+      autoload :Threads,     'flare/tools/cli/threads'
+      autoload :Verify,      'flare/tools/cli/verify'
     end
   end
 end

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

@@ -19,28 +19,29 @@ class Flare::Tools::Cli::Dispatch
 
   def initialize
     @subcommands = {
-      'list'        => Cli::List,
+      'activate'    => Cli::Activate,
       'balance'     => Cli::Balance,
       'down'        => Cli::Down,
-      'slave'       => Cli::Slave,
-      'reconstruct' => Cli::Reconstruct,
+      'dump'        => Cli::Dump,
+      'dumpkey'     => Cli::Dumpkey,
+      'index'       => Cli::Index,
+      'list'        => Cli::List,
       'master'      => Cli::Master,
-      'threads'     => Cli::Threads,
+      'part'        => Cli::Part,
       'ping'        => Cli::Ping,
+      'reconstruct' => Cli::Reconstruct,
       'remove'      => Cli::Remove,
-      'index'       => Cli::Index,
-      'activate'    => Cli::Activate,
-      'dump'        => Cli::Dump,
-      'dumpkey'     => Cli::Dumpkey,
-      'verify'      => Cli::Verify,
-      'stats'       => Cli::Stats,
       'restore'     => Cli::Restore,
+      'slave'       => Cli::Slave,
+      'stats'       => Cli::Stats,
       'summary'     => Cli::Summary,
-      'part'        => Cli::Part,
+      'threads'     => Cli::Threads,
+      'verify'      => Cli::Verify,
     }
   end
 
   def main(subcommand_name, argv, as_subcommand)
+    prepare
     _main(subcommand_name, argv, as_subcommand)
   rescue => e
     level = 1
@@ -55,6 +56,10 @@ class Flare::Tools::Cli::Dispatch
 
 private
 
+  def prepare
+    Thread.abort_on_exception = true
+  end
+
   def _main(subcommand_name, argv, as_subcommand)
     @subcommand_name = subcommand_name
 

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

@@ -1,122 +1,84 @@
 # -*- coding: utf-8; -*-
-# Authors::   Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>
-# Copyright:: Copyright (C) GREE, Inc. 2011.
+# Authors::   Yuya YAGUCHI <yuya.yaguchi@gree.net>
+# Copyright:: Copyright (C) GREE, Inc. 2014.
 # License::   MIT-style
 
-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'
+require 'flare/cli/parse_host_port_pairs'
+require 'flare/cli/ask_node_remove'
+require 'flare/operation/node_remove'
 
-module Flare
-  module Tools
-    module Cli
+module Flare; end
+module Flare::Tools; end
+module Flare::Tools::Cli; end
 
-      class Remove < SubCommand
-        include Flare::Util::Conversion
-        include Flare::Tools::Common
-        include Flare::Tools::Cli::IndexServerConfig
+class Flare::Tools::Cli::Remove < Flare::Tools::Cli::SubCommand
+  include Flare::Tools::Common
+  include Flare::Tools::Cli::IndexServerConfig
+  include Flare::Cli::ParseHostPortPairs
+  include Flare::Cli::AskNodeRemove
+  include Flare::Operation::NodeRemove
 
-        myname :remove
-        desc   "remove a node. (experimental)"
-        usage  "remove"
+  myname :remove
+  desc   "remove a downed node."
+  usage  "remove [hostname:port] ..."
 
-        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 setup
+    super
+    set_option_index_server
+    set_option_dry_run
+    set_option_force
+    @optp.on('--retry=COUNT', "retry count(default:#{@retry})") {|v| @retry = v.to_i }
+  end
 
-        def initialize
-          super
-          @force = false
-          @wait = 30
-          @retry = 5
-          @connection_threshold = 2
-        end
+  def initialize
+    super
+    @retry = 0
+  end
 
-        def execute(config, args)
-          parse_index_server(config, args)
+  def execute(config, args)
+    parse_index_server(config, args)
+    nodes = parse_host_port_pairs(args)
+    unless nodes
+      return S_NG
+    end
 
-          hosts = args.map {|x| x.split(':')}
-          hosts.each do |x|
-            if x.size != 2
-              error "invalid argument '#{x.join(':')}'. it must be hostname:port."
-              return S_NG
-            end
-          end
+    Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], @timeout) do |s|
+      cluster = fetch_cluster(s)
 
-          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], @timeout) do |s|
-            cluster = fetch_cluster(s)
+      nodes.each do |node|
+        node_stat = cluster.node_stat(node.nodekey)
 
-            hosts.each do |hostname,port|
-              nodekey = nodekey_of hostname, port
-              unless cluster.has_nodekey? nodekey
-                error "unknown node name: #{nodekey}"
-                return S_NG
-              end
-            end
+        unless node_stat
+          error "node not found in cluster. (node=#{node})"
+          next
+        end
 
-            hosts.each do |hostname,port|
-              exec = false
-              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)
-                while nwait > 0
-                  conn = node['curr_connections'].to_i
-                  cluster = fetch_cluster(s)
-                  role = cluster.node_stat("#{hostname}:#{port}")['role']
-                  info "waiting until #{hostname}:#{port} (role=#{role}, connections=#{conn}) is inactive..."
-                  if conn <= @connection_threshold && role == 'proxy'
-                    exec = true
-                    break
-                  end
-                  interruptible {sleep 1}
-                  nwait -= 1
-                  node = n.stats
-                end
-                unless @force
-                  node_stat = cluster.node_stat("#{hostname}:#{port}")
-                  role = node_stat['role']
-                  state = node_stat['state']
-                  STDERR.print "please shutdown the daemon and continue (node=#{hostname}:#{port}, role=#{role}, state=#{state}) (y/n): "
-                  interruptible {
-                    exec = false if gets.chomp.upcase != "Y"
-                  }
-                end
-              end
+        # check status downed & proxy
+        unless node_can_remove_safely?(node_stat)
+          error "node should role=proxy and state=down. (node=#{node} role=#{node_stat.role} state=#{node_stat.state})"
+          return S_NG
+        end
 
-              if exec
-                suc = false
-                nretry = @retry
-                while nretry > 0
-                  resp = false
-                  info "removing #{hostname}:#{port}."
-                  resp = s.node_remove(hostname, port) unless @dry_run
-                  if resp
-                    suc = true
-                    break
-                  end
-                  nretry -= 1
-                end
-                info "done." if suc
-                info "failed." unless suc
-              else
-                info "skipped."
-              end
-            end
-            puts string_of_nodelist(s.stats_nodes)
-          end
+        # ask really remove or not
+        unless @force || ask_node_remove(node, node_stat)
+          return S_NG
+        end
 
-          S_OK
+        succeeded = node_remove(s, node, @retry, @dry_run)
+        unless succeeded
+          error "node remove failed. (node=#{node})"
+          return S_NG
         end
       end
+
+      # puts node list after nodes removed
+      puts ""
+      puts string_of_nodelist(s.stats_nodes)
+
+      return S_OK
     end
   end
 end

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

@@ -204,7 +204,7 @@ module Flare
                 :time       => time,
               }
             rescue Errno::ECONNREFUSED => e
-            rescue => e
+            rescue Timeout::Error, StandardError => e
               begin
                 s.close unless s.nil?
               rescue => close_error

data/lib/flare/tools/stats.rb

@@ -62,6 +62,12 @@ module Flare
         threads
       end
 
+      defcmd :stats_threads_queue, 'stats threads queue\r\n' do |resp|
+        m = /STAT total_thread_queue (\d+)/.match(resp)
+        return false unless m
+        m[1].to_i
+      end
+
       defcmd :ping, 'ping\r\n' do |resp|
         true if resp
       end

data/test/integration/cli_test.rb

@@ -239,8 +239,7 @@ class CliTest < Test::Unit::TestCase
     master = targets.shift
     args = targets.map{|n| "#{n.hostname}:#{n.port}"}
     assert_equal(S_OK, down(*args))
-    args = targets.map{|n| "#{n.hostname}:#{n.port}"} << "--connection-threshold=4"
-    # sleep 3
+    targets.map{|n| @flare_cluster.shutdown_node(n) }
     assert_equal(S_OK, remove(*args))
     assert_equal(false, @flare_cluster.exist?(args[0]))
     assert_equal(false, @flare_cluster.exist?(args[1]))
@@ -251,8 +250,8 @@ class CliTest < Test::Unit::TestCase
     @flare_cluster.prepare_data(@node_servers[0], "key", 1000)
     targets = @node_servers.dup
     master = targets.shift
-    args = targets.map{|n| "#{n.hostname}:#{n.port}"} << "--connection-threshold=4" << "--wait=3"
-    assert_equal(S_OK, remove(*args))
+    args = targets.map{|n| "#{n.hostname}:#{n.port}"}
+    assert_equal(S_NG, remove(*args))
     assert_equal(true, @flare_cluster.exist?(args[0]))
     assert_equal(true, @flare_cluster.exist?(args[1]))
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flare-tools
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - kikehara
@@ -10,70 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: tokyocabinet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.29'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Flare-tools is a collection of tools for Flare distributed key-value
@@ -114,8 +105,11 @@ files:
 - bin/flare-stats
 - bin/flare-zkadmin
 - flare-tools.gemspec
+- lib/flare/cli/ask_node_remove.rb
+- lib/flare/cli/parse_host_port_pairs.rb
 - lib/flare/entity/server.rb
 - lib/flare/net/connection.rb
+- lib/flare/operation/node_remove.rb
 - lib/flare/test/cluster.rb
 - lib/flare/test/daemon.rb
 - lib/flare/test/node.rb
@@ -210,30 +204,26 @@ files:
 homepage: http://github.com/gree/flare-tools
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4173589925550821460
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Management Tools for Flare
 test_files:
 - test/experimental/cache_test.rb