flare-tools 0.4.5.1 → 0.5.0

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

@@ -5,11 +5,14 @@
 
 require 'flare/util/logging'
 require 'flare/util/interruption'
+require 'flare/tools/cli/option'
 
 module Flare
   module Tools
     module Cli
       class SubCommand
+        include Flare::Tools::Cli::Option
+
         @@myname = {}
         @@desc = {}
         @@usage = {}
@@ -52,14 +55,22 @@ module Flare
           self.to_sym.to_s
         end
 
-        def initalize
+        def initialize
+          option_init
         end
 
-        def setup(opt)
-          raise "setup"
+        def setup
+          set_option_global
         end
-        
-        def execute(config, *args)
+
+        def execute_subcommand(config, args)
+          setup
+          rest_args = parse_options(config, args)
+
+          execute(config, rest_args)
+        end
+
+        def execute
           raise "execute"
         end
 

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

@@ -8,19 +8,18 @@ require 'flare/tools/index_server'
 require 'flare/tools/cli/sub_command'
 require 'flare/tools/common'
 require 'flare/util/conversion'
+require 'flare/tools/cli/index_server_config'
 
-# 
 module Flare
   module Tools
     module Cli
 
-      # == Description
-      #
       class Summary < SubCommand
         include Flare::Util::Conversion
         include Flare::Util::Logging
         include Flare::Tools::Common
-        
+        include Flare::Tools::Cli::IndexServerConfig
+
         myname :summary
         desc   "show the summary of a flare cluster."
         usage  "summary [hostname:port] ..."
@@ -33,19 +32,22 @@ module Flare
                          ['%16s',     'size'],
                          ['%13s',    'items'] ]
 
-        def setup(opt)
+        def setup
+          super
+          set_option_index_server
         end
 
         def initialize
           super
         end
-  
-        def execute(config, *args)
+
+        def execute(config, args)
+          parse_index_server(config, args)
           nodes = {}
           threads = {}
           header = HeaderConfig
 
-          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|
             nodes = s.stats_nodes
             unless nodes
               error "Invalid index server."
@@ -69,7 +71,7 @@ module Flare
 
           nodes.each do |hostname_port,data|
             hostname, port = hostname_port.split(":", 2)
-            Flare::Tools::Stats.open(hostname, data['port'], config[:timeout]) do |s|
+            Flare::Tools::Stats.open(hostname, data['port'], @timeout) do |s|
               stats = s.stats
               p = data['partition'].to_i
               total_parts = p+1 if p+1 > total_parts if data['role'] == 'master'
@@ -85,7 +87,7 @@ module Flare
           label = format % header.map{|x| x[1]}.flatten
           puts label
           puts(format % [name, total_parts, total_nodes, total_masters, total_slaves, total_bytes, total_items])
-          
+
           S_OK
         end
 

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

@@ -7,6 +7,7 @@ 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
@@ -14,18 +15,23 @@ module Flare
       class Threads < SubCommand
         include Flare::Util::Conversion
         include Flare::Tools::Common
+        include Flare::Tools::Cli::IndexServerConfig
 
         myname :threads
         desc   "show the list of threads in a flare cluster."
         usage  "threads [hostname:port]"
-  
-        def setup(opt)
+
+        def setup
+          super
+          set_option_index_server
         end
 
         def initialize
+          super
         end
 
-        def execute(config, *args)
+        def execute(config, args)
+          parse_index_server(config, args)
           header = [
                     ['%5s', 'id'],
                     ['%-32s', 'peer'],
@@ -49,14 +55,14 @@ module Flare
             error "invalid arguments: "+args.join(' ')
             return S_NG
           end
-          
+
           threads = []
-          
-          Flare::Tools::Stats.open(hostname, port, config[:timeout]) do |s|
+
+          Flare::Tools::Stats.open(hostname, port, @timeout) do |s|
             threads = s.stats_threads
             threads = threads.sort_by{|key,val| [val['peer'], key]}
           end
-          
+
           puts format % header.map{|x| x[1]}.flatten
 
           threads.each do |thread_id, data|
@@ -68,10 +74,10 @@ module Flare
                            data['queue'],
                           ]
           end
-          
+
           S_OK
         end
-        
+
       end
     end
   end

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

@@ -9,26 +9,27 @@ require 'flare/util/conversion'
 require 'flare/util/key_resolver'
 require 'flare/util/hash_function'
 require 'flare/tools/cli/sub_command'
+require 'flare/tools/cli/index_server_config'
 require 'digest/md5'
 
 
-# 
 module Flare
   module Tools
     module Cli
 
-      # == Description
-      # 
       class Verify < SubCommand
         include Flare::Util::Conversion
         include Flare::Util::HashFunction
+        include Flare::Tools::Cli::IndexServerConfig
 
         myname :verify
         desc   "verify the cluster. (experimental)"
         usage  "verify"
-  
-        def setup(opt)
-          opt.on('--key-hash-algorithm=TYPE',              "key hash algorithm") do |v|
+
+        def setup
+          super
+          set_option_index_server
+          @optp.on('--key-hash-algorithm=TYPE',              "key hash algorithm") do |v|
             case @key_hash_algorithm = v.to_sym
             when :simple, :crc32
             else
@@ -36,12 +37,12 @@ module Flare
               exit
             end
           end
-          opt.on('--use-test-data',                        "store test data")           {|v| @use_test_data = true}
-          opt.on('--debug',                                "use debug mode")            {|v| @debug = true}
-          opt.on('--64bit',                                "(experimental) 64bit mode") {|v| @word_size = 64}
-          opt.on('--verbose',                              "use verbose mode")          {|v| @verbose = true}
-          opt.on('--meta',                                 "use meta command")          {|v| @meta = true}
-          opt.on('--quiet',                                "use quiet mode")            {|v| @quiet = true}
+          @optp.on('--use-test-data',                        "store test data")           {|v| @use_test_data = true}
+          @optp.on('--debug',                                "use debug mode")            {|v| @debug = true}
+          @optp.on('--64bit',                                "(experimental) 64bit mode") {|v| @word_size = 64}
+          @optp.on('--verbose',                              "use verbose mode")          {|v| @verbose = true}
+          @optp.on('--meta',                                 "use meta command")          {|v| @meta = true}
+          @optp.on('--quiet',                                "use quiet mode")            {|v| @quiet = true}
         end
 
         def initialize
@@ -57,12 +58,13 @@ module Flare
           @quiet = false
         end
 
-        def execute(config, *args)
+        def execute(config, args)
+          parse_index_server(config, args)
           keys = {}
           cout = STDERR
           status = S_OK
           info "connecting to index ..."
-          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|
             nodes = s.stats_nodes.sort_by{|key, val| [val['partition'].to_i, val['role'], key]}
 
             # meta
@@ -111,7 +113,7 @@ module Flare
 
             if @use_test_data
               info "storing test data ..."
-              Flare::Tools::Node.open(hostname0, port0.to_i, config[:timeout]) do |n|
+              Flare::Tools::Node.open(hostname0, port0.to_i, @timeout) do |n|
                 (1..10000).each do |i|
                   key = ".test."+Digest::MD5.new.update(i.to_s).to_s
                   n.set(key, i.to_s)
@@ -123,7 +125,7 @@ module Flare
             nodes.each do |nodekey,val|
               hostname, port = nodekey.split(":", 2)
               partition = val['partition'].to_i
-              Flare::Tools::Node.open(hostname, port.to_i, config[:timeout]) do |n|
+              Flare::Tools::Node.open(hostname, port.to_i, @timeout) do |n|
                 cout.write "checking #{nodekey} ... "
                 msg = "OK"
                 interruptible do
@@ -178,7 +180,7 @@ module Flare
               error "failed: not found #{remain} keys" if remain > 0
 
               # delete
-              Flare::Tools::Node.open(hostname0, port0.to_i, config[:timeout]) do |n|
+              Flare::Tools::Node.open(hostname0, port0.to_i, @timeout) do |n|
                 keys.each do |k,v|
                   n.delete(k)
                 end
@@ -194,7 +196,7 @@ module Flare
           end
           status
         end
-        
+
       end
     end
   end

data/lib/flare/tools/cluster.rb

@@ -128,8 +128,8 @@ module Flare
                   true
                 when RoleMaster
                   # if the partition has at least one active slave, one of the slaves will take over the master.
-                  slaves_in_partition(node[StatPartition]).inject(false) do |r,slave_nodekey|
-                    node_stat(slave_nodekey)[State] == StateActive
+                  slaves_in_partition(node[StatPartition]).inject(false) do |r, slave_nodekey|
+                    r || node_stat(slave_nodekey)[State] == StateActive
                   end
                 else
                   error "unknown role: #{node[Role]}"
@@ -252,6 +252,7 @@ module Flare
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
 <boost_serialization signature="serialization::archive" version="4">
+<version>0</version>
 <node_map#{serattr_(node_map_id)}>
 \t<count>#{@nodes.size}</count>
 \t<item_version>0</item_version>

data/lib/flare/util/constant.rb

@@ -20,6 +20,9 @@ module Flare
       DefaultTimeout         = 10
       # the default bandwidth limit (bps)
       DefalutBwlimit         = 0 # unlimited
+
+      STATUS_OK = 0
+      STATUS_NG = 1
     end
   end
 end

data/lib/flare/util/pretty_table.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8; -*-
+# Authors::   Yuya YAGUCHI <yuya.yaguchi@gree.net>
+# Copyright:: Copyright (C) GREE, Inc. 2014.
+# License::   MIT-style
+
+require 'flare/util/pretty_table/table.rb'
+require 'flare/util/pretty_table/column.rb'
+require 'flare/util/pretty_table/row.rb'

data/lib/flare/util/pretty_table/column.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8; -*-
+# Authors::   Yuya YAGUCHI <yuya.yaguchi@gree.net>
+# Copyright:: Copyright (C) GREE, Inc. 2014.
+# License::   MIT-style
+
+module Flare
+  module Util
+    module PrettyTable
+      class Column
+        def initialize(text, options = {})
+          @text = text.to_s
+          @align = options[:align] || :left
+        end
+
+        def width
+          @text.size
+        end
+
+        def prettify(column_width)
+          if self.width >= column_width
+            return @text
+          end
+
+          padding = padding(column_width - self.width)
+          case @align
+          when :left then
+            @text + padding
+          else # @align == :right
+            padding + @text
+          end
+        end
+
+        private
+
+        def padding(length)
+          ' ' * length
+        end
+      end
+    end
+  end
+end

data/lib/flare/util/pretty_table/row.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8; -*-
+# Authors::   Yuya YAGUCHI <yuya.yaguchi@gree.net>
+# Copyright:: Copyright (C) GREE, Inc. 2014.
+# License::   MIT-style
+
+module Flare
+  module Util
+    module PrettyTable
+      class Row
+        attr_reader :columns
+
+        def initialize(option = {})
+          @columns = []
+          @separator = option[:separator] || ' '
+        end
+
+        def add_column(column)
+          @columns << column
+        end
+
+        def prettify(column_widths)
+          @columns \
+            .each_with_index.map {|column, index| column.prettify(column_widths[index]) } \
+            .join(@separator)
+        end
+      end
+    end
+  end
+end

data/lib/flare/util/pretty_table/table.rb

@@ -0,0 +1,37 @@
+# -*- coding: utf-8; -*-
+# Authors::   Yuya YAGUCHI <yuya.yaguchi@gree.net>
+# Copyright:: Copyright (C) GREE, Inc. 2014.
+# License::   MIT-style
+
+module Flare
+  module Util
+    module PrettyTable
+      class Table
+        def initialize
+          @rows = []
+        end
+
+        def add_row(row)
+          @rows << row
+        end
+
+        def prettify
+          column_widths = max_column_widths
+          @rows \
+            .map {|row| row.prettify(column_widths) } \
+            .join("\n")
+        end
+
+        def max_column_widths
+          widths = []
+          @rows.each do |row|
+            row.columns.each_with_index do |column, index|
+              widths[index] = [column.width, (widths[index] || 0)].max
+            end
+          end
+          widths
+        end
+      end
+    end
+  end
+end

data/package/Rakefile

@@ -0,0 +1,44 @@
+
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../lib")
+
+require 'flare/tools'
+
+flaretools = "flare-tools"
+
+task :default => [:build]
+
+task :build do |t|
+  sh "(cd #{flaretools} && debuild -us -uc)"
+end
+
+task :debclean do
+  sh "(cd #{flaretools} && debclean)"
+end
+
+task :change do
+  puts "================================="
+  puts "  Flare::Tools::VERSION = #{Flare::Tools::VERSION}"
+  puts "================================="
+  sh "(cd #{flaretools} && dch -i)"
+end
+
+def previous version
+  prev = version.split('.').map{|v| v.to_i}
+  prev[2] -= 1
+  prev.join('.')
+end
+
+task :autochange do
+  v = Flare::Tools::VERSION
+  since = previous(v)
+  sh "git-dch --debian-branch='(no branch)' --new-version #{version} --since=#{since}"
+end
+
+task :clean => [:debclean] do
+  sh "rm -f *.dsc *.tar.gz *.build *.changes"
+end
+
+task :cleanall => [:clean] do
+  sh "rm -f flare-tools/debian/changelog.dch"
+end
+