flare-tools 0.7.1 → 0.7.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.7.2 / 2016-03-01
+* Minor Enhancements
+  * Modify 'index' subcommand to output node_map_version with Flare 1.3.1 or later.
+
 === 0.7.1 / 2015-09-10
 * Minor Enhancements
   * Fixed short commands. (ex. `flare-stats`)

data/README.txt

@@ -342,6 +342,7 @@ subcommands:
 [index] print the index XML document from a cluster information.
   Usage: flare-admin index
         --output=[FILE]              output index to a file
+        --increment=[VERSION]        increment node_map_version
 
 [reconstruct] reconstruct the database of nodes by copying.
   Usage: flare-admin reconstruct [hostname:port] ...

data/lib/flare/tools.rb

@@ -9,8 +9,8 @@ module Flare
   # flare-tools module.
   module Tools
     # the version number of flare-tools
-    VERSION = '0.7.1'
-    TITLE = "Flare-tools version #{VERSION} Copyright (C) GREE, Inc. 2011-2015"
+    VERSION = '0.7.2'
+    TITLE = "Flare-tools version #{VERSION} Copyright (C) GREE, Inc. 2011-2016"
     autoload :Common,      'flare/tools/common'
     autoload :Cluster,     'flare/tools/cluster'
     autoload :Stats,       'flare/tools/stats'

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

@@ -24,22 +24,24 @@ module Flare
         def setup
           super
           set_option_index_server
-          @optp.on('--output=FILE',            "output index to a file") {|v| @output = v}
+          @optp.on('--output=FILE',            "output index to a file"    ) {|v| @output = v}
+          @optp.on('--increment=VERSION',      "increment node_map_version") {|v| @increment = v}
         end
 
         def initialize
           super
           @output = nil
+          @increment = nil
         end
 
         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|
+          cluster, node_map_version = 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)
+            [Flare::Tools::Cluster.new(s.host, s.port, s.stats_nodes), s.stats['node_map_version']]
           end
 
-          output = cluster.serialize
+          output = cluster.serialize(node_map_version.to_i + @increment.to_i)
           if @output.nil?
             info output
           else

data/lib/flare/tools/cluster.rb

@@ -241,7 +241,7 @@ module Flare
         " class_id=\"#{x['class_id']}\" tracking_level=\"#{x['tracking_level']}\" version=\"#{x['version']}\""
       end
 
-      def serialize
+      def serialize(node_map_version = nil)
         thread_type = 0
 
         node_map_id = {"class_id"=>"0", "tracking_level"=>"0", "version"=>"0"}
@@ -252,7 +252,15 @@ module Flare
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
 <boost_serialization signature="serialization::archive" version="4">
-<version>0</version>
+EOS
+
+        if node_map_version
+          output +=<<"EOS"
+<version>#{node_map_version}</version>
+EOS
+        end
+
+        output +=<<"EOS"
 <node_map#{serattr_(node_map_id)}>
 \t<count>#{@nodes.size}</count>
 \t<item_version>0</item_version>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flare-tools
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3590447130553905001
+      hash: -3541811138210506065
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: