YUKI Hiroshi
null+****@clear*****
Thu Dec 25 16:20:04 JST 2014
YUKI Hiroshi 2014-12-25 16:20:04 +0900 (Thu, 25 Dec 2014) New Revision: c508067ea652ced8b859c69208bd9d54790c7bdf https://github.com/droonga/droonga-engine/commit/c508067ea652ced8b859c69208bd9d54790c7bdf Message: Extract cluster-specific features of EngineState to ClusterState Conflicts: lib/droonga/dispatcher.rb lib/droonga/engine_state.rb Modified files: lib/droonga/buffered_forwarder.rb lib/droonga/dispatcher.rb lib/droonga/engine_state.rb lib/droonga/plugins/system.rb test/unit/plugins/system/test_status.rb Modified: lib/droonga/buffered_forwarder.rb (+3 -3) =================================================================== --- lib/droonga/buffered_forwarder.rb 2014-12-25 16:01:46 +0900 (27def7c) +++ lib/droonga/buffered_forwarder.rb 2014-12-25 16:20:04 +0900 (4426a9d) @@ -25,7 +25,7 @@ module Droonga def initialize(loop, options={}) @loop = loop - @engine_state = options[:engine_state] + @cluster_state = options[:cluster_state] @buffers = {} @forwarder = Forwarder.new(loop, :buffering => true) end @@ -77,8 +77,8 @@ module Droonga private def writable_node?(node_name) - @engine_state.nil? or - not @engine_state.unwritable_node?(node_name) + @cluster_state.nil? or + not @cluster_state.unwritable_node?(node_name) end def log_tag Modified: lib/droonga/dispatcher.rb (+2 -2) =================================================================== --- lib/droonga/dispatcher.rb 2014-12-25 16:01:46 +0900 (cc487a9) +++ lib/droonga/dispatcher.rb 2014-12-25 16:20:04 +0900 (4e11ffe) @@ -193,11 +193,11 @@ module Droonga dataset =****@catal*****(step["dataset"]) if dataset if write_step?(step) - target_nodes = @engine_state.writable_nodes + target_nodes = @engine_state.cluster.writable_nodes logger.trace("dispatch_steps: target_nodes = writable_nodes", :nodes => target_nodes) else - target_nodes = @engine_state.forwardable_nodes + target_nodes = @engine_state.cluster.forwardable_nodes logger.trace("dispatch_steps: target_nodes = forwardable_nodes", :nodes => target_nodes) end Modified: lib/droonga/engine_state.rb (+13 -86) =================================================================== --- lib/droonga/engine_state.rb 2014-12-25 16:01:46 +0900 (657b081) +++ lib/droonga/engine_state.rb 2014-12-25 16:20:04 +0900 (6ce220a) @@ -21,7 +21,7 @@ require "droonga/loggable" require "droonga/event_loop" require "droonga/buffered_forwarder" require "droonga/replier" -require "droonga/node_metadata" +require "droonga/cluster_state" module Droonga class EngineState @@ -33,21 +33,27 @@ module Droonga attr_reader :forwarder attr_reader :replier attr_writer :on_ready + attr_reader :catalog + attr_reader :cluster attr_accessor :on_finish - attr_accessor :catalog + def initialize(loop, name, internal_name) @loop = loop @name = name @internal_name = internal_name @sessions = {} @current_id = 0 + @cluster = ClusterState.new @forwarder = BufferedForwarder.new(@loop, - :engine_state => self) + :cluster_state => self) @replier = Replier.new(@forwarder) @on_ready = nil @on_finish = nil @catalog = nil - @live_nodes_list = nil + end + + def catalog=(catalog) + @catalog =****@clust***** = catalog end def start @@ -118,97 +124,18 @@ module Droonga not****@sessi*****? end - def all_nodes - @catalog.all_nodes - end - - def dead_nodes - if @live_nodes_list - @live_nodes_list.dead_nodes - else - [] - end - end - - def service_provider_nodes - if @live_nodes_list - @live_nodes_list.service_provider_nodes - else - all_nodes - end - end - - def absorb_source_nodes - if @live_nodes_list - @live_nodes_list.absorb_source_nodes - else - [] - end - end - - def absorb_destination_nodes - if @live_nodes_list - @live_nodes_list.absorb_destination_nodes - else - [] - end - end - - def same_role_nodes - case node_metadata.role - when NodeStatus::Role::SERVICE_PROVIDER - all_nodes & service_provider_nodes - when NodeStatus::Role::ABSORB_SOURCE - all_nodes & absorb_source_nodes - when NodeStatus::Role::ABSORB_DESTINATION - all_nodes & absorb_destination_nodes - else - [] - end - end - - def forwardable_nodes - same_role_nodes - dead_nodes - end - - def writable_nodes - case node_metadata.role - when NodeMetadata::Role::SERVICE_PROVIDER - all_nodes - when NodeMetadata::Role::ABSORB_SOURCE - all_nodes & absorb_source_nodes - when NodeMetadata::Role::ABSORB_DESTINATION - all_nodes & absorb_destination_nodes - else - [] - end - end - - def live_nodes_list=(new_nodes_list) - old_live_nodes_list = @live_nodes_list - @live_nodes_list = new_nodes_list - unless old_live_nodes_list == new_nodes_list - @forwarder.resume - end - @live_nodes_list + def on_ready + @on_ready.call if @on_ready end def select_responsive_routes(routes) - selected_nodes = forwardable_nodes + selected_nodes =****@clust*****_nodes routes.select do |route| selected_nodes.include?(farm_path(route)) end end - def on_ready - @on_ready.call if @on_ready - end - private - def node_metadata - @node_metadata ||= NodeMetadata.new - end - def log_tag "engine_state" end Modified: lib/droonga/plugins/system.rb (+4 -4) =================================================================== --- lib/droonga/plugins/system.rb 2014-12-25 16:01:46 +0900 (7e0f723) +++ lib/droonga/plugins/system.rb 2014-12-25 16:20:04 +0900 (d5612ba) @@ -25,11 +25,11 @@ module Droonga action.synchronous = true def handle(message) - engine_state =****@messe*****_state - active_nodes = engine_state.forwardable_nodes - dead_nodes = engine_state.dead_nodes + cluster =****@messe*****_state.cluster + active_nodes = cluster.forwardable_nodes + dead_nodes = cluster.dead_nodes nodes = {} - engine_state.all_nodes.collect do |identifier| + cluster.all_nodes.collect do |identifier| if active_nodes.include?(identifier) status = "active" elsif dead_nodes.include?(identifier) Modified: test/unit/plugins/system/test_status.rb (+5 -0) =================================================================== --- test/unit/plugins/system/test_status.rb 2014-12-25 16:01:46 +0900 (e33865b) +++ test/unit/plugins/system/test_status.rb 2014-12-25 16:20:04 +0900 (03f1fb8) @@ -46,6 +46,11 @@ class SystemStatusHandlerTest < Test::Unit::TestCase end class StubEngineState + def cluster + @cluster ||= StubClusterState.new + end + + class StubClusterState def all_nodes [ "127.0.0.1:10031/droonga", -------------- next part -------------- HTML����������������������������...Download
