YUKI Hiroshi
null+****@clear*****
Tue Apr 21 11:45:17 JST 2015
YUKI Hiroshi 2015-04-21 11:45:17 +0900 (Tue, 21 Apr 2015) New Revision: 0ffb346385bc553b66f887fd50774dd923778143 https://github.com/droonga/droonga-engine/commit/0ffb346385bc553b66f887fd50774dd923778143 Message: Isolate command implementations from NodeMetadata Modified files: bin/droonga-engine-absorb-data bin/droonga-engine-join Modified: bin/droonga-engine-absorb-data (+0 -1) =================================================================== --- bin/droonga-engine-absorb-data 2015-04-21 11:43:52 +0900 (f3d6153) +++ bin/droonga-engine-absorb-data 2015-04-21 11:45:17 +0900 (e2d81b8) @@ -26,7 +26,6 @@ require "droonga/node_name" require "droonga/data_absorber_client" require "droonga/serf" require "droonga/client" -require "droonga/node_metadata" require "droonga/restarter" module Droonga Modified: bin/droonga-engine-join (+5 -5) =================================================================== --- bin/droonga-engine-join 2015-04-21 11:43:52 +0900 (f8eee72) +++ bin/droonga-engine-join 2015-04-21 11:45:17 +0900 (faefdaf) @@ -24,13 +24,13 @@ require "coolio" require "droonga/engine/version" require "droonga/path" require "droonga/node_name" +require "droonga/node_role" require "droonga/catalog/dataset" require "droonga/catalog/fetcher" require "droonga/catalog/loader" require "droonga/safe_file_writer" require "droonga/data_absorber_client" require "droonga/serf" -require "droonga/node_metadata" module Droonga class JoinCommand @@ -223,7 +223,7 @@ module Droonga puts("Changing role of the source node...") source_node_serf.send_query("change_role", "node" => source_node.to_s, - "role" => NodeMetadata::Role::ABSORB_SOURCE) + "role" => NodeRole::ABSORB_SOURCE) wait_until_restarted(source_node) end @source_node_role_changed = true @@ -233,7 +233,7 @@ module Droonga puts("Changing role of the joining node...") joining_node_serf.send_query("change_role", "node" => joining_node.to_s, - "role" => NodeMetadata::Role::ABSORB_DESTINATION) + "role" => NodeRole::ABSORB_DESTINATION) wait_until_restarted(joining_node) @joining_node_role_changed = true end @@ -243,7 +243,7 @@ module Droonga puts("Restoring role of the source node...") source_node_serf.send_query("change_role", "node" => source_node.to_s, - "role" => NodeMetadata::Role::SERVICE_PROVIDER) + "role" => NodeRole::SERVICE_PROVIDER) wait_until_restarted(source_node.to_s) end @source_node_role_changed = false @@ -253,7 +253,7 @@ module Droonga puts("Restoring role of the joining node...") joining_node_serf.send_query("change_role", "node" => joining_node.to_s, - "role" => NodeMetadata::Role::SERVICE_PROVIDER) + "role" => NodeRole::SERVICE_PROVIDER) wait_until_restarted(joining_node.to_s) @joining_node_role_changed = false end -------------- next part -------------- HTML����������������������������...下载
