Groonga - fulltext search engine.

[Groonga-commit] droonga/droonga-engine at 3ca1a18 [buffered-forward] Rename NodeStatus to NodeMetadata

YUKI Hiroshi null+****@clear*****
Thu Dec 25 15:14:16 JST 2014

• Previous message: [Groonga-commit] groonga/grnxx at be94069 [master] Add a test for N/A key rejection. (#138)
• Next message: [Groonga-commit] droonga/droonga-engine at 983f636 [master] Rename NodeStatus to NodeMetadata
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

YUKI Hiroshi	2014-12-25 15:14:16 +0900 (Thu, 25 Dec 2014)

  New Revision: 3ca1a18c026e2bf407607ea1d2849a5c485b7215
  https://github.com/droonga/droonga-engine/commit/3ca1a18c026e2bf407607ea1d2849a5c485b7215

  Message:
    Rename NodeStatus to NodeMetadata
    
    Conflicts:
    	lib/droonga/engine_state.rb

  Modified files:
    bin/droonga-engine-absorb-data
    bin/droonga-engine-join
    lib/droonga/command/droonga_engine.rb
    lib/droonga/command/remote.rb
    lib/droonga/engine.rb
    lib/droonga/engine_state.rb
    lib/droonga/live_nodes_list.rb
    lib/droonga/path.rb
    lib/droonga/serf.rb
  Renamed files:
    lib/droonga/node_metadata.rb
      (from lib/droonga/node_status.rb)

  Modified: bin/droonga-engine-absorb-data (+3 -2)
===================================================================
--- bin/droonga-engine-absorb-data    2014-12-24 19:16:54 +0900 (36837df)
+++ bin/droonga-engine-absorb-data    2014-12-25 15:14:16 +0900 (aa73f53)
@@ -26,6 +26,7 @@ require "droonga/path"
 require "droonga/data_absorber"
 require "droonga/serf"
 require "droonga/client"
+require "droonga/node_metadata"
 
 class AbsorbDataCommand
   def run
@@ -216,8 +217,8 @@ class AbsorbDataCommand
     timestamp = response["value"]
     puts "The timestamp of the last processed message in the source node: #{timestamp}"
     if timestamp and not timestamp.empty?
-      status = NodeStatus.new
-      status.set(:effective_message_timestamp, timestamp)
+      metadata = NodeMetadata.new
+      metadata.set(:effective_message_timestamp, timestamp)
     end
   end
 

  Modified: bin/droonga-engine-join (+3 -3)
===================================================================
--- bin/droonga-engine-join    2014-12-24 19:16:54 +0900 (52b3d27)
+++ bin/droonga-engine-join    2014-12-25 15:14:16 +0900 (fe30785)
@@ -28,7 +28,7 @@ require "droonga/catalog_loader"
 require "droonga/safe_file_writer"
 require "droonga/data_absorber"
 require "droonga/serf"
-require "droonga/node_status"
+require "droonga/node_metadata"
 
 class JoinCommand
   def run
@@ -153,11 +153,11 @@ class JoinCommand
     if absorber.source_node_suspendable?
       run_remote_command(source_node, "change_role",
                          "node" => source_node,
-                         "role" => Droonga::NodeStatus::Role::ABSORB_SOURCE)
+                         "role" => Droonga::NodeMetadata::Role::ABSORB_SOURCE)
     end
     run_remote_command(joining_node, "change_role",
                        "node" => joining_node,
-                       "role" => Droonga::NodeStatus::Role::ABSORB_DESTINATION)
+                       "role" => Droonga::NodeMetadata::Role::ABSORB_DESTINATION)
     @node_role_changed = true
   end
 

  Modified: lib/droonga/command/droonga_engine.rb (+1 -1)
===================================================================
--- lib/droonga/command/droonga_engine.rb    2014-12-24 19:16:54 +0900 (3a1acbb)
+++ lib/droonga/command/droonga_engine.rb    2014-12-25 15:14:16 +0900 (69784cb)
@@ -26,7 +26,7 @@ require "droonga/engine/version"
 require "droonga/path"
 require "droonga/address"
 require "droonga/serf"
-require "droonga/node_status"
+require "droonga/node_metadata"
 require "droonga/file_observer"
 require "droonga/process_supervisor"
 

  Modified: lib/droonga/command/remote.rb (+11 -11)
===================================================================
--- lib/droonga/command/remote.rb    2014-12-24 19:16:54 +0900 (dec9e97)
+++ lib/droonga/command/remote.rb    2014-12-25 15:14:16 +0900 (adbfb62)
@@ -17,7 +17,7 @@ require "json"
 
 require "droonga/path"
 require "droonga/serf"
-require "droonga/node_status"
+require "droonga/node_metadata"
 require "droonga/catalog_generator"
 require "droonga/catalog_modifier"
 require "droonga/catalog_fetcher"
@@ -96,15 +96,15 @@ module Droonga
 
       class ReportStatus < Base
         def process
-          status = NodeStatus.new
-          @response["value"] = status.get(@params["key"])
+          metadata = NodeMetadata.new
+          @response["value"] = metadata.get(@params["key"])
         end
       end
 
       class SetStatus < Base
         def process
-          status = NodeStatus.new
-          status.set(@params["key"], @params["value"])
+          metadata = NodeMetadata.new
+          metadata.set(@params["key"], @params["value"])
         end
       end
 
@@ -237,15 +237,15 @@ module Droonga
           end
           sleep(5) #TODO: wait for restart. this should be done more safely, to avoid starting of absorbing with old catalog.json.
 
-          status = NodeStatus.new
-          status.set(:absorbing, true)
+          metadata = NodeMetadata.new
+          metadata.set(:absorbing, true)
           DataAbsorber.absorb(:dataset          => dataset_name,
                               :source_host      => source_host,
                               :destination_host => joining_host,
                               :port             => port,
                               :tag              => tag,
                               :messages_per_second => messages_per_second)
-          status.delete(:absorbing)
+          metadata.delete(:absorbing)
           sleep(1)
         end
       end
@@ -275,8 +275,8 @@ module Droonga
           log("port    = #{port}")
           log("tag     = #{tag}")
 
-          status = NodeStatus.new
-          status.set(:absorbing, true)
+          metadata = NodeMetadata.new
+          metadata.set(:absorbing, true)
           DataAbsorber.absorb(:dataset          => dataset_name,
                               :source_host      => source,
                               :destination_host => host,
@@ -284,7 +284,7 @@ module Droonga
                               :tag              => tag,
                               :messages_per_second => messages_per_second,
                               :client           => "droonga-send")
-          status.delete(:absorbing)
+          metadata.delete(:absorbing)
         end
 
         private

  Modified: lib/droonga/engine.rb (+14 -14)
===================================================================
--- lib/droonga/engine.rb    2014-12-24 19:16:54 +0900 (ec9047f)
+++ lib/droonga/engine.rb    2014-12-25 15:14:16 +0900 (308e343)
@@ -24,7 +24,7 @@ require "droonga/catalog_loader"
 require "droonga/dispatcher"
 require "droonga/file_observer"
 require "droonga/live_nodes_list_loader"
-require "droonga/node_status"
+require "droonga/node_metadata"
 
 module Droonga
   class Engine
@@ -41,11 +41,11 @@ module Droonga
       @live_nodes_list_observer.on_change = lambda do
         @state.live_nodes_list = load_live_nodes_list
       end
-      @node_status_observer = FileObserver.new(loop, Path.node_status)
-      @node_status_observer.on_change = lambda do
-        logger.trace("reloading node_status: start")
-        node_status.reload
-        logger.trace("reloading node_status: done")
+      @node_metadata_observer = FileObserver.new(loop, Path.node_metadata)
+      @node_metadata_observer.on_change = lambda do
+        logger.trace("reloading node_metadata: start")
+        node_metadata.reload
+        logger.trace("reloading node_metadata: done")
       end
       @on_ready = nil
     end
@@ -57,7 +57,7 @@ module Droonga
       end
       @state.start
       @live_nodes_list_observer.start
-      @node_status_observer.start
+      @node_metadata_observer.start
       @dispatcher.start
       logger.trace("start: done")
     end
@@ -65,7 +65,7 @@ module Droonga
     def stop_gracefully
       logger.trace("stop_gracefully: start")
       @live_nodes_list_observer.stop
-      @node_status_observer.stop
+      @node_metadata_observer.stop
       on_finish = lambda do
         logger.trace("stop_gracefully/on_finish: start")
         save_last_processed_message_timestamp
@@ -90,7 +90,7 @@ module Droonga
       logger.trace("stop_immediately: start")
       save_last_processed_message_timestamp
       @live_nodes_list_observer.stop
-      @node_status_observer.stop
+      @node_metadata_observer.stop
       @dispatcher.stop_immediately
       @state.shutdown
       logger.trace("stop_immediately: done")
@@ -102,8 +102,8 @@ module Droonga
       @dispatcher.process_message(message)
     end
 
-    def node_status
-      @node_status ||= NodeStatus.new
+    def node_metadata
+      @node_metadata ||= NodeMetadata.new
     end
 
     private
@@ -134,7 +134,7 @@ module Droonga
     def save_last_processed_message_timestamp
       logger.trace("output_last_processed_message_timestamp: start")
       if @last_processed_message_timestamp
-        node_status.set(:last_processed_message_timestamp, @last_processed_message_timestamp.to_s)
+        node_metadata.set(:last_processed_message_timestamp, @last_processed_message_timestamp.to_s)
       end
       logger.trace("output_last_processed_message_timestamp: done")
     end
@@ -148,13 +148,13 @@ module Droonga
       return false if effective_timestamp >= message_timestamp
 
       logger.trace("deleting obsolete effective_message_timestamp: start")
-      node_status.delete(:effective_message_timestamp)
+      node_metadata.delete(:effective_message_timestamp)
       logger.trace("deleting obsolete effective_message_timestamp: done")
       true
     end
 
     def effective_message_timestamp
-      timestamp = node_status.get(:effective_message_timestamp)
+      timestamp = node_metadata.get(:effective_message_timestamp)
       return nil unless timestamp
 
       begin

  Modified: lib/droonga/engine_state.rb (+7 -7)
===================================================================
--- lib/droonga/engine_state.rb    2014-12-24 19:16:54 +0900 (8e8ab18)
+++ lib/droonga/engine_state.rb    2014-12-25 15:14:16 +0900 (4fe1485)
@@ -21,7 +21,7 @@ require "droonga/loggable"
 require "droonga/event_loop"
 require "droonga/buffered_forwarder"
 require "droonga/replier"
-require "droonga/node_status"
+require "droonga/node_metadata"
 
 module Droonga
   class EngineState
@@ -172,12 +172,12 @@ module Droonga
     end
 
     def writable_nodes
-      case node_status.role
-      when NodeStatus::Role::SERVICE_PROVIDER
+      case node_metadata.role
+      when NodeMetadata::Role::SERVICE_PROVIDER
         all_nodes
-      when NodeStatus::Role::ABSORB_SOURCE
+      when NodeMetadata::Role::ABSORB_SOURCE
         all_nodes & absorb_source_nodes
-      when NodeStatus::Role::ABSORB_DESTINATION
+      when NodeMetadata::Role::ABSORB_DESTINATION
         all_nodes & absorb_destination_nodes
       else
         []
@@ -205,8 +205,8 @@ module Droonga
     end
 
     private
-    def node_status
-      @node_status ||= NodeStatus.new
+    def node_metadata
+      @node_metadata ||= NodeMetadata.new
     end
 
     def log_tag

  Modified: lib/droonga/live_nodes_list.rb (+4 -4)
===================================================================
--- lib/droonga/live_nodes_list.rb    2014-12-24 19:16:54 +0900 (17bb957)
+++ lib/droonga/live_nodes_list.rb    2014-12-25 15:14:16 +0900 (d564a7e)
@@ -13,7 +13,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "droonga/node_status"
+require "droonga/node_metadata"
 
 module Droonga
   class LiveNodesList
@@ -73,15 +73,15 @@ module Droonga
     end
 
     def collect_service_provider_nodes
-      collect_nodes_by_role(NodeStatus::Role::SERVICE_PROVIDER)
+      collect_nodes_by_role(NodeMetadata::Role::SERVICE_PROVIDER)
     end
 
     def collect_absorb_source_nodes
-      collect_nodes_by_role(NodeStatus::Role::ABSORB_SOURCE)
+      collect_nodes_by_role(NodeMetadata::Role::ABSORB_SOURCE)
     end
 
     def collect_absorb_destination_nodes
-      collect_nodes_by_role(NodeStatus::Role::ABSORB_DESTINATION)
+      collect_nodes_by_role(NodeMetadata::Role::ABSORB_DESTINATION)
     end
   end
 end

  Renamed: lib/droonga/node_metadata.rb (+12 -12) 78%
===================================================================
--- lib/droonga/node_status.rb    2014-12-24 19:16:54 +0900 (449c012)
+++ lib/droonga/node_metadata.rb    2014-12-25 15:14:16 +0900 (cf6cab2)
@@ -18,7 +18,7 @@ require "droonga/path"
 require "droonga/safe_file_writer"
 
 module Droonga
-  class NodeStatus
+  class NodeMetadata
     module Role
       SERVICE_PROVIDER   = "engine"
       ABSORB_SOURCE      = "engine-absorb-source"
@@ -31,24 +31,24 @@ module Droonga
 
     def have?(key)
       key = normalize_key(key)
-      @status.include?(key)
+      @metadata.include?(key)
     end
 
     def get(key)
       key = normalize_key(key)
-      @status[key]
+      @metadata[key]
     end
 
     def set(key, value)
       key = normalize_key(key)
-      @status[key] = value
-      SafeFileWriter.write(status_file, JSON.pretty_generate(@status))
+      @metadata[key] = value
+      SafeFileWriter.write(metadata_file, JSON.pretty_generate(@metadata))
     end
 
     def delete(key)
       key = normalize_key(key)
-      @status.delete(key)
-      SafeFileWriter.write(status_file, JSON.pretty_generate(@status))
+      @metadata.delete(key)
+      SafeFileWriter.write(metadata_file, JSON.pretty_generate(@metadata))
     end
 
     def role
@@ -60,7 +60,7 @@ module Droonga
     end
 
     def reload
-      @status = load
+      @metadata = load
     end
 
     private
@@ -68,13 +68,13 @@ module Droonga
       key.to_sym
     end
 
-    def status_file
-      @status_file ||= Path.node_status
+    def metadata_file
+      @metadata_file ||= Path.node_metadata
     end
 
     def load
-      if status_file.exist?
-        contents = status_file.read
+      if metadata_file.exist?
+        contents = metadata_file.read
         unless contents.empty?
           return JSON.parse(contents, :symbolize_names => true)
         end

  Modified: lib/droonga/path.rb (+2 -2)
===================================================================
--- lib/droonga/path.rb    2014-12-24 19:16:54 +0900 (806c887)
+++ lib/droonga/path.rb    2014-12-25 15:14:16 +0900 (ab547a1)
@@ -44,8 +44,8 @@ module Droonga
         base + "state"
       end
 
-      def node_status
-        state + "status_file"
+      def node_metadata
+        state + "metadata.json"
       end
 
       def live_nodes_list

  Modified: lib/droonga/serf.rb (+6 -6)
===================================================================
--- lib/droonga/serf.rb    2014-12-24 19:16:54 +0900 (1c50c04)
+++ lib/droonga/serf.rb    2014-12-25 15:14:16 +0900 (15ad5c3)
@@ -22,7 +22,7 @@ require "open3"
 require "droonga/path"
 require "droonga/loggable"
 require "droonga/catalog_loader"
-require "droonga/node_status"
+require "droonga/node_metadata"
 require "droonga/serf_downloader"
 require "droonga/line_buffer"
 require "droonga/safe_file_writer"
@@ -164,13 +164,13 @@ module Droonga
     end
 
     def role
-      node_status.role
+      node_metadata.role
     end
 
     def role=(new_role)
-      new_role ||= NodeStatus::Role::SERVICE_PROVIDER
+      new_role ||= NodeMetadata::Role::SERVICE_PROVIDER
       set_tag("role", new_role)
-      node_status.role = new_role
+      node_metadata.role = new_role
     end
 
     def cluster_id
@@ -243,8 +243,8 @@ module Droonga
       "#{extract_host(@name)}:7373"
     end
 
-    def node_status
-      @node_status ||= NodeStatus.new
+    def node_metadata
+      @node_metadata ||= NodeMetadata.new
     end
 
     def port
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] groonga/grnxx at be94069 [master] Add a test for N/A key rejection. (#138)
• Next message: [Groonga-commit] droonga/droonga-engine at 983f636 [master] Rename NodeStatus to NodeMetadata
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]