YUKI Hiroshi
null+****@clear*****
Thu Mar 19 19:15:06 JST 2015
YUKI Hiroshi 2015-03-19 19:15:06 +0900 (Thu, 19 Mar 2015) New Revision: 4479bf3eac0c01fb77155d2e6b24a4891edde5b8 https://github.com/droonga/droonga-engine/commit/4479bf3eac0c01fb77155d2e6b24a4891edde5b8 Message: Update cluster information before ready for testing Modified files: lib/droonga/command/droonga_engine.rb lib/droonga/serf.rb Modified: lib/droonga/command/droonga_engine.rb (+22 -3) =================================================================== --- lib/droonga/command/droonga_engine.rb 2015-03-19 17:35:04 +0900 (1aa3134) +++ lib/droonga/command/droonga_engine.rb 2015-03-19 19:15:06 +0900 (e30aa88) @@ -422,11 +422,27 @@ module Droonga def setup_initial_on_ready return if****@confi*****_notify_fd.nil? + + rest_tasks = 0 + @service_runner.on_ready = lambda do - output = IO.new(@configuration.ready_notify_fd) - output.puts("ready") - output.close + rest_tasks -= 1 + notify_initial_ready if rest_tasks.zero? + end + rest_tasks += 1 + + @serf_agent.on_ready = lambda do + @serf.update_cluster_state + rest_tasks -= 1 + notify_initial_ready if rest_tasks.zero? end + rest_tasks += 1 + end + + def notify_initial_ready + output = IO.new(@configuration.ready_notify_fd) + output.puts("ready") + output.close end def trap_signals @@ -509,6 +525,9 @@ module Droonga def start_serf @serf = Serf.new(@configuration.engine_name) @serf_agent =****@serf*****_agent(@loop) + @serf_agent.on_ready = lambda do + @serf.update_cluster_state + end end def stop_serf Modified: lib/droonga/serf.rb (+0 -3) =================================================================== --- lib/droonga/serf.rb 2015-03-19 17:35:04 +0900 (34e3f85) +++ lib/droonga/serf.rb 2015-03-19 19:15:06 +0900 (06117b0) @@ -59,9 +59,6 @@ module Droonga "-tag", "role=#{role}", "-tag", "cluster_id=#{cluster_id}", *retry_joins) - agent.on_ready = lambda do - update_cluster_state - end agent.start logger.trace("run_agent: done") agent -------------- next part -------------- HTML����������������������������...Download
