YUKI Hiroshi
null+****@clear*****
Fri Jan 16 16:29:50 JST 2015
YUKI Hiroshi 2015-01-16 16:29:50 +0900 (Fri, 16 Jan 2015) New Revision: 869df87fcc7fed5894ca39f57b84afc4c515c86d https://github.com/droonga/droonga-engine/commit/869df87fcc7fed5894ca39f57b84afc4c515c86d Message: Make NodeMetadata required parameter Modified files: lib/droonga/cluster.rb lib/droonga/engine.rb lib/droonga/engine_node.rb lib/droonga/engine_state.rb lib/droonga/serf.rb Modified: lib/droonga/cluster.rb (+3 -7) =================================================================== --- lib/droonga/cluster.rb 2015-01-15 18:06:18 +0900 (80490b9) +++ lib/droonga/cluster.rb 2015-01-16 16:29:50 +0900 (c2015f3) @@ -26,13 +26,13 @@ module Droonga attr_accessor :catalog attr_writer :on_change - def initialize(loop, options={}) + def initialize(loop, params) @loop = loop @catalog = nil @state = nil @on_change = nil - @node_metadata = options[:metadata] + @node_metadata = params[:metadata] reload end @@ -161,7 +161,7 @@ module Droonga EngineNode.new(name, node_state, @loop, - :metadata => node_metadata) + :metadata => @node_metadata) end end @@ -169,10 +169,6 @@ module Droonga {} end - def node_metadata - @node_metadata ||= NodeMetadata.new - end - def log_tag "cluster_state" end Modified: lib/droonga/engine.rb (+10 -10) =================================================================== --- lib/droonga/engine.rb 2015-01-15 18:06:18 +0900 (1d5298e) +++ lib/droonga/engine.rb 2015-01-16 16:29:50 +0900 (e0636a3) @@ -32,20 +32,24 @@ module Droonga attr_writer :on_ready def initialize(loop, name, internal_name) + @node_metadata = NodeMetadata.new @state = EngineState.new(loop, name, internal_name, - :metadata => node_metadata) + :metadata => @node_metadata) @cluster = Cluster.new(loop, - :metadata => node_metadata) + :metadata => @node_metadata) @catalog = load_catalog @state.catalog =****@clust***** = @catalog + @dispatcher = create_dispatcher + @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 + @node_metadata.reload logger.trace("reloading node_metadata: done") end + @on_ready = nil end @@ -103,10 +107,6 @@ module Droonga @dispatcher.process_message(message) end - def node_metadata - @node_metadata ||= NodeMetadata.new - end - private def load_catalog catalog_path = Path.catalog @@ -125,7 +125,7 @@ module Droonga def save_last_processed_message_timestamp logger.trace("output_last_processed_message_timestamp: start") if @last_processed_message_timestamp - node_metadata.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 @@ -147,13 +147,13 @@ module Droonga return false if effective_timestamp >= message_timestamp logger.trace("deleting obsolete effective_message_timestamp: start") - node_metadata.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_metadata.get(:effective_message_timestamp) + timestamp = @node_metadata.get(:effective_message_timestamp) return nil unless timestamp begin Modified: lib/droonga/engine_node.rb (+3 -7) =================================================================== --- lib/droonga/engine_node.rb 2015-01-15 18:06:18 +0900 (9157b28) +++ lib/droonga/engine_node.rb 2015-01-16 16:29:50 +0900 (f2e2cc7) @@ -23,10 +23,10 @@ module Droonga attr_reader :name - def initialize(name, state, loop, options={}) + def initialize(name, state, loop, params) @name = name @state = state - @sender_node_metadata ||= options[:metadata] + @sender_node_metadata = params[:metadata] parsed_name = parse_node_name(@name) @sender = FluentMessageSender.new(loop, @@ -134,11 +134,7 @@ module Droonga end def sender_role - sender_node_metadata.role - end - - def sender_node_metadata - @sender_node_metadata ||= NodeMetadata.new + @sender_node_metadata.role end def output(message, destination) Modified: lib/droonga/engine_state.rb (+3 -7) =================================================================== --- lib/droonga/engine_state.rb 2015-01-15 18:06:18 +0900 (bf0eb31) +++ lib/droonga/engine_state.rb 2015-01-16 16:29:50 +0900 (c1e816f) @@ -36,7 +36,7 @@ module Droonga attr_accessor :catalog attr_accessor :on_finish - def initialize(loop, name, internal_name, options={}) + def initialize(loop, name, internal_name, params) @loop = loop @name = name @internal_name = internal_name @@ -47,7 +47,7 @@ module Droonga @on_ready = nil @on_finish = nil @catalog = nil - @node_metadata = options[:metadata] + @node_metadata = params[:metadata] end def start @@ -107,7 +107,7 @@ module Droonga end def role - node_metadata.role + @node_metadata.role end def on_ready @@ -115,10 +115,6 @@ module Droonga end private - def node_metadata - @node_metadata ||= NodeMetadata.new - end - def log_tag "engine_state" end Modified: lib/droonga/serf.rb (+3 -6) =================================================================== --- lib/droonga/serf.rb 2015-01-15 18:06:18 +0900 (f21e6cc) +++ lib/droonga/serf.rb 2015-01-16 16:29:50 +0900 (d68cdab) @@ -40,6 +40,7 @@ module Droonga @serf = nil @name = name @service_installation = ServiceInstallation.new + @node_metadata = NodeMetadata.new end def run_agent(loop) @@ -142,13 +143,13 @@ module Droonga end def role - node_metadata.role + @node_metadata.role end def role=(new_role) new_role ||= NodeMetadata::Role::SERVICE_PROVIDER set_tag("role", new_role) - node_metadata.role = new_role + @node_metadata.role = new_role end def cluster_id @@ -206,10 +207,6 @@ module Droonga 7373 end - def node_metadata - @node_metadata ||= NodeMetadata.new - end - def agent_port Agent::PORT end -------------- next part -------------- HTML����������������������������...Descargar
