YUKI Hiroshi
null+****@clear*****
Mon Mar 23 11:40:17 JST 2015
YUKI Hiroshi 2015-03-23 11:40:17 +0900 (Mon, 23 Mar 2015) New Revision: 3137cf1ae471ad075e34784894c12e1f2facdbc6 https://github.com/droonga/droonga-engine/commit/3137cf1ae471ad075e34784894c12e1f2facdbc6 Message: Wait for restarting after each step Modified files: bin/droonga-engine-join Modified: bin/droonga-engine-join (+3 -1) =================================================================== --- bin/droonga-engine-join 2015-03-23 11:38:37 +0900 (ed831e4) +++ bin/droonga-engine-join 2015-03-23 11:40:17 +0900 (1c09a39) @@ -45,7 +45,6 @@ class JoinCommand set_node_role update_existing_nodes do_join - wait_until_restarted(joining_node, source_node) monitor_copying_state unless @options["no-copy"] set_effective_message_timestamp reset_node_role @@ -183,6 +182,7 @@ class JoinCommand "source" => source_node, "dataset" => @options[:dataset], "copy" => !@options["no-copy"]) + wait_until_restarted(joining_node, source_node) end def monitor_copying_state @@ -221,6 +221,7 @@ class JoinCommand "node" => joining_node, "key" => "effective_message_timestamp", "value" => timestamp) + wait_until_restarted(joining_node) end end @@ -230,6 +231,7 @@ class JoinCommand "cluster_id" => source_cluster_id, "dataset" => @options[:dataset], "hosts" => [@options[:host]]) + wait_until_restarted(source_node) end def trap_signals -------------- next part -------------- HTML����������������������������... Download