flare-tools 0.5.0 → 0.6.0

data/.gitignore

@@ -22,3 +22,4 @@ tmp
 *.o
 *.a
 mkmf.log
+environment.txt

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.6.0 / 2014-11-07
+* Minor Enhancements
+  * Modify default options to safely
+    * Clean up the node before constructiong the master/slave node by default.
+    * Check redundancy of the partition before recontstructiong with --all option by default.
+
 === 0.5.0 / 2014-10-15
 * Refactoring structures
   * Refactoring.

data/README.txt

@@ -267,6 +267,7 @@ subcommands:
         --force                      commit changes without confirmation
         --retry=[COUNT]              specify retry count (default:10)
         --activate                   change node's state from ready to active
+        --without-clean              don't clear datastore before construction
 
 [balance] set the balance values of nodes.
   Usage: flare-admin balance [hostname:port:balance] ...
@@ -326,7 +327,8 @@ subcommands:
   Usage: flare-admin slave [hostname:port:balance:partition] ...
         --force                      commit changes without confirmation
         --retry=[COUNT]              specify retry count(default:10)
-        --clean                      clear datastore before construction
+        --without-clean              don't clear datastore before construction
+        --clean                      [obsolete] now slave command clear datastore before construction by default.
 
 [list] show the list of nodes in a flare cluster.
   Usage: flare-admin list
@@ -347,8 +349,9 @@ subcommands:
 [reconstruct] reconstruct the database of nodes by copying.
   Usage: flare-admin reconstruct [hostname:port] ...
         --force                      commit changes without confirmation
-        --safe                       reconstruct a node safely
-        --retry=[COUNT]              specify retry count (default:10)
+        --unsafe                     reconstruct a node safely
+        --safe                       [obsolete] now reconstruct a node safely by default
+        --retry=COUNT                specify retry count (default:10)
         --all                        reconstruct all nodes
 
 == THANKS:

data/lib/flare/entity/server.rb

@@ -1,4 +1,7 @@
 module Flare; end
 module Flare::Entity; end
 class Flare::Entity::Server < Struct.new(:host, :port)
+  def to_s
+    "#{self.host}:#{self.port}"
+  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.5.0'
+    VERSION = '0.6.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/master.rb

@@ -30,8 +30,9 @@ module Flare
           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}
+          @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 }
+          @optp.on('--without-clean', "don't clear datastore before construction") { @without_clean = true }
         end
 
         def initialize
@@ -39,6 +40,7 @@ module Flare
           @force = false
           @retry = 10
           @activate = false
+          @without_clean = false
         end
 
         def execute(config, args)
@@ -89,11 +91,27 @@ module Flare
                 info "no need to change the role of #{ipaddr}:#{port}."
               elsif existing_master
                 info "the partiton already has a master #{existing_master}."
+              elsif node['role'] != 'proxy'
+                puts "#{nodekey} is not a proxy."
               else
-                STDERR.print "making the node master (node=#{ipaddr}:#{port}, role=#{node['role']} -> #{role}) (y/n): "
+                clean_notice_base = "\nitems stored in the node will be cleaned up (exec flush_all) before constructing it"
+                clean_notice = @without_clean ? clean_notice_base : ''
+                STDERR.print "making the node master (node=#{ipaddr}:#{port}, role=#{node['role']} -> #{role})#{clean_notice} (y/n): "
                 exec = interruptible {(gets.chomp.upcase == "Y")}
               end
               if exec && !@dry_run
+                unless @without_clean
+                  resp = false
+                  Flare::Tools::Node.open(hostname, port, @timeout) do |n|
+                    resp = n.flush_all
+                  end
+                  unless resp
+                    STDERR.print "executing flush_all failed."
+                    return S_NG
+                  end
+                  puts "executed flush_all command before constructing the master node."
+                end
+
                 nretry = 0
                 resp = false
                 while resp == false && nretry < @retry

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

@@ -31,15 +31,18 @@ module Flare
           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}
+          @optp.on('--unsafe',         "reconstruct a node safely"              ) { @unsafe = true }
+          @optp.on('--safe',           "[obsolete] now reconstruct a node safely by default") do
+            # do nothing
+          end
+          @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
           super
           @force = false
-          @safe = false
+          @unsafe = false
           @retry = 10
           @all = false
         end
@@ -88,7 +91,7 @@ module Flare
                 next
               end
               is_safe = cluster.safely_reconstructable? nodekey
-              if @safe && !is_safe
+              if !@unsafe && !is_safe
                 puts "The partition needs one more slave to reconstruct #{nodekey} safely."
                 status = S_NG
                 next

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

@@ -33,15 +33,18 @@ module Flare
           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('--clean',          "clear datastore before construction") {@clean = true}
+          @optp.on('--retry=COUNT', "specify retry count(default:#{@retry})") {|v| @retry = v.to_i}
+          @optp.on('--without-clean', "don't clear datastore before construction") { @without_clean = true }
+          @optp.on('--clean', '[obsolete] now slave command clear datastore before construction by default.') do
+            # do nothing
+          end
         end
 
         def initialize
           super
           @force = false
           @retry = DefaultRetry
-          @clean = false
+          @without_clean = false
         end
 
         def execute(config, args)
@@ -77,16 +80,24 @@ module Flare
 
               exec = @force
               unless exec
-                STDERR.print "making node slave (node=#{nodekey}, role=#{node['role']} -> slave) (y/n): "
+                clean_notice_base = "\nitems stored in the node will be cleaned up (exec flush_all) before constructing it"
+                clean_notice = @without_clean ? clean_notice_base : ''
+                STDERR.print "making node slave (node=#{nodekey}, role=#{node['role']} -> slave)#{clean_notice} (y/n): "
                 interruptible do
                   exec = true if gets.chomp.upcase == "Y"
                 end
               end
               if exec && !@dry_run
-                if @clean
+                unless @without_clean
+                  resp = false
                   Flare::Tools::Node.open(hostname, port, @timeout) do |n|
-                    n.flush_all
+                    resp = n.flush_all
+                  end
+                  unless resp
+                    STDERR.print "executing flush_all failed."
+                    return S_NG
                   end
+                  puts "executed flush_all command before constructing the slave node."
                 end
 
                 nretry = 0

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

@@ -126,18 +126,13 @@ module Flare
             nodes.each do |k, n|
               max_nodekey_length = k.length if k.length > max_nodekey_length
             end
-            table = Table.new
-            add_header_to_table(table, header_configs)
-            nodes.each do |k, node|
-              stats_data = queue[k].pop
-              next if (args.size > 0 && !args.include?(k))
-              behind = (threads.has_key?(k) || threads[k].has_key?('behind')) ? threads[k]['behind'] : "-"
-              r = record(stats_data, node, behind, query_prev, k)
-              add_record_to_table(table, header_configs, r)
-            end
+            r = records(args, nodes, queue, threads, query_prev)
             interruptible {
               wait_for_stats
             }
+            table = Table.new
+            add_header_to_table(table, header_configs)
+            add_records_to_table(table, header_configs, r)
             puts table.prettify
           end
           s.close
@@ -235,12 +230,24 @@ module Flare
           table.add_row(row)
         end
 
-        def add_record_to_table(table, header_configs, record)
-          row = Row.new(:separator => @delimiter)
-          header_configs.each_with_index do |header_config, index|
-            row.add_column(Column.new(record[index], header_config[1]))
+        def add_records_to_table(table, header_configs, records)
+          records.each do |record|
+            row = Row.new(:separator => @delimiter)
+            header_configs.each_with_index do |header_config, index|
+              row.add_column(Column.new(record[index], header_config[1]))
+            end
+            table.add_row(row)
+          end
+        end
+
+        # You can override this method to extend stats infos.
+        def records(args, nodes, queue, threads, query_prev)
+          nodes.map do |k, node|
+            stats_data = queue[k].pop
+            next if (args.size > 0 && !args.include?(k))
+            behind = (threads.has_key?(k) || threads[k].has_key?('behind')) ? threads[k]['behind'] : "-"
+            record(stats_data, node, behind, query_prev, k)
           end
-          table.add_row(row)
         end
 
         # You can override this method to extend stats infos.

data/test/system/flare_admin_test.rb

@@ -159,10 +159,13 @@ class FlareAdminTest < Test::Unit::TestCase
     p = @datanodes[0].port
     flare_admin_with_yes "master --index-server=#{@indexname}:#{@indexport} #{h}:#{p}:1:0"
     assert_equal(S_OK, $?.exitstatus)
-    h = @datanodes[1].hostname
-    p = @datanodes[1].port
-    flare_admin_with_yes "slave --index-server=#{@indexname}:#{@indexport} #{h}:#{p}:1:0"
-    assert_equal(S_OK, $?.exitstatus)
+    [1, 2].each do |i|
+      assert_equal(S_OK, $?.exitstatus)
+      h = @datanodes[i].hostname
+      p = @datanodes[i].port
+      flare_admin_with_yes "slave --index-server=#{@indexname}:#{@indexport} #{h}:#{p}:1:0"
+      assert_equal(S_OK, $?.exitstatus)
+    end
     flare_admin_with_yes "reconstruct --index-server=#{@indexname}:#{@indexport} --all"
     assert_equal(S_OK, $?.exitstatus)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flare-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 54780071370042886
+      hash: 4173589925550821460
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: