YUKI Hiroshi
null+****@clear*****
Fri Sep 5 17:51:33 JST 2014
YUKI Hiroshi 2014-09-05 17:51:33 +0900 (Fri, 05 Sep 2014) New Revision: 80a575a0cc4966962a2ec5007f28c9f12e678bec https://github.com/droonga/droonga-engine/commit/80a575a0cc4966962a2ec5007f28c9f12e678bec Message: Revert "Make shutdown processes yieldable" This reverts commit 76c35f01e996632ff129876cb84227b769bd2ff5. To step back to the position before I introduce changes to make shutdown processes "yieldable". Modified files: lib/droonga/command/droonga_engine_service.rb lib/droonga/engine.rb lib/droonga/fluent_message_receiver.rb lib/droonga/internal_fluent_message_receiver.rb lib/droonga/worker_process_agent.rb Modified: lib/droonga/command/droonga_engine_service.rb (+6 -28) =================================================================== --- lib/droonga/command/droonga_engine_service.rb 2014-09-05 17:51:20 +0900 (b1def56) +++ lib/droonga/command/droonga_engine_service.rb 2014-09-05 17:51:33 +0900 (1037804) @@ -133,14 +133,9 @@ module Droonga end def shutdown_internal_message_receiver - if @internal_message_receiver.nil? - yield - return - end + return if @internal_message_receiver.nil? @internal_message_receiver, receiver = nil, @internal_message_receiver - receiver.shutdown do - yield - end + receiver.shutdown end def run_engine @@ -172,9 +167,7 @@ module Droonga end def shutdown_worker_process_agent - @worker_process_agent.stop do - yield - end + @worker_process_agent.stop end def create_receiver @@ -212,25 +205,10 @@ module Droonga def stop_gracefully return if @stopping @stopping = true - - n_rest_shutdowns = 3 - on_finish = lambda do - n_rest_shutdowns -= 1 - if n_rest_shutdowns.zero? - yield - end - end - - @receiver.stop_gracefully do - on_finish.call - end + @receiver.stop_gracefully @engine.stop_gracefully do - shutdown_worker_process_agent do - on_finish.call - end - shutdown_internal_message_receiver do - on_finish.call - end + shutdown_worker_process_agent + shutdown_internal_message_receiver end end Modified: lib/droonga/engine.rb (+3 -13) =================================================================== --- lib/droonga/engine.rb 2014-09-05 17:51:20 +0900 (deb1657) +++ lib/droonga/engine.rb 2014-09-05 17:51:33 +0900 (c47ebac) @@ -55,23 +55,13 @@ module Droonga def stop_gracefully logger.trace("stop_gracefully: start") - n_rest_shutdowns = 2 @live_nodes_list_observer.stop on_finish = lambda do logger.trace("stop_gracefully/on_finish: start") output_last_processed_timestamp - on_completely_finish = lambda do - n_rest_shutdowns -= 1 - if n_rest_shutdowns.zero? - yield - end - end - @dispatcher.shutdown do - on_completely_finish.call - end - @state.shutdown do - on_completely_finish.call - end + @dispatcher.shutdown + @state.shutdown + yield logger.trace("stop_gracefully/on_finish: done") end if****@state*****_session? Modified: lib/droonga/fluent_message_receiver.rb (+9 -27) =================================================================== --- lib/droonga/fluent_message_receiver.rb 2014-09-05 17:51:20 +0900 (65b0b94) +++ lib/droonga/fluent_message_receiver.rb 2014-09-05 17:51:33 +0900 (c54a6d3) @@ -42,30 +42,17 @@ module Droonga def stop_gracefully logger.trace("stop_gracefully: start") - n_rest_shutdowns = 2 - on_finish = lambda do - n_rest_shutdowns -= 1 - if n_rest_shutdowns.zero? - yield - logger.trace("stop_gracefully: done") - end - end - shutdown_heartbeat_receiver do - on_finish.call - end - shutdown_server do - on_finish.call - end + shutdown_heartbeat_receiver + logger.trace("stop_gracefully: middle") + shutdown_server + logger.trace("stop_gracefully: done") end def stop_immediately logger.trace("stop_immediately: start") - stop_gracefully do - shutdown_clients do - yield - logger.trace("stop_immediately: done") - end - end + stop_gracefully + shutdown_clients + logger.trace("stop_immediately: done") end private @@ -78,10 +65,8 @@ module Droonga def shutdown_heartbeat_receiver logger.trace("shutdown_heartbeat_receiver: start") - @heartbeat_receiver.shutdown do - yield - logger.trace("shutdown_heartbeat_receiver: done") - end + @heartbeat_receiver.shutdown + logger.trace("shutdown_heartbeat_receiver: done") end def start_server @@ -106,7 +91,6 @@ module Droonga def shutdown_server logger.trace("shutdown_server: start") @server.close - yield logger.trace("shutdown_server: done") end @@ -114,7 +98,6 @@ module Droonga @clients.each do |client| client.close end - yield end def log_tag @@ -143,7 +126,6 @@ module Droonga def shutdown @socket.close @watcher.detach - yield end private Modified: lib/droonga/internal_fluent_message_receiver.rb (+0 -1) =================================================================== --- lib/droonga/internal_fluent_message_receiver.rb 2014-09-05 17:51:20 +0900 (4de0dec) +++ lib/droonga/internal_fluent_message_receiver.rb 2014-09-05 17:51:33 +0900 (181c213) @@ -43,7 +43,6 @@ module Droonga shutdown_message_receiver shutdown_heartbeat_socket shutdown_listen_socket - yield logger.trace("shutdown: done") end Modified: lib/droonga/worker_process_agent.rb (+1 -15) =================================================================== --- lib/droonga/worker_process_agent.rb 2014-09-05 17:51:20 +0900 (f158316) +++ lib/droonga/worker_process_agent.rb 2014-09-05 17:51:33 +0900 (fa75b39) @@ -41,32 +41,18 @@ module Droonga def stop logger.trace("stop: start") - - n_rest_closes = 2 - on_finish = lambda do - n_rest_closes -= 1 - if n_rest_closes.zero? - yield - logger.trace("stop: done") - end - end - if @output @output, output = nil, @output output.write(Messages::FINISH) output.on_write_complete do output.close - on_finish.call end - else - on_finish.call end - if @input @input, input = nil, @input input.close end - on_finish.call + logger.trace("stop: done") end def ready -------------- next part -------------- HTML����������������������������...Download