YUKI Hiroshi
null+****@clear*****
Sun Jun 29 01:46:11 JST 2014
YUKI Hiroshi 2014-06-29 01:46:11 +0900 (Sun, 29 Jun 2014) New Revision: 64e33928328d88f935d7d9db0967472dbd317c6c https://github.com/droonga/droonga-engine/commit/64e33928328d88f935d7d9db0967472dbd317c6c Message: Process join command by serf event Modified files: bin/droonga-engine-join Modified: bin/droonga-engine-join (+5 -39) =================================================================== --- bin/droonga-engine-join 2014-06-29 01:43:29 +0900 (9a1678e) +++ bin/droonga-engine-join 2014-06-29 01:46:11 +0900 (131bd1c) @@ -86,7 +86,6 @@ end generator = Droonga::CatalogGenerator.new generator.load(source_catalog) - dataset = generator.dataset_for_host(options.replica_source_host) unless dataset raise "Specified source host #{options.replica_source_host} is not a " + @@ -94,48 +93,15 @@ unless dataset "--replica-source-host option." end -options.dataset = dataset.name -options.tag = dataset.tag -options.port = dataset.port -options.other_hosts = dataset.hosts +options.tag = dataset.tag +options.port = dataset.port options.joining_node = "#{options.joining_host}:#{options.port}/#{options.tag}" -options.source_node = "#{options.replica_source_host}:#{options.port}/#{options.tag}" - -if options.copy - puts "Initializing new replica..." - - Droonga::Serf.send_event(options.joining_node, "set_replicas", - "dataset" => options.dataset, - "hosts" => [options.joining_host]) - - sleep(1) # wait for restart - - puts "Copying data..." -#TODO: currently there is no way to wait the absorb command is successfully finished via serf... -# -# Droonga::Serf.send_event(options.joining_node, "absorb_data", -# "source" => options.replica_source_host, -# "dataset" => options.dataset, -# "port" => options.port, -# "tag" => options.tag) - Droonga::DataAbsorber.absorb(:dataset => options.dataset, - :source_host => options.replica_source_host, - :destination_host => options.joining_host, - :port => options.port, - :tag => options.tag) do |dump| - puts dump - end - sleep(1) -end puts "Joining new replica to the cluster..." -Droonga::Serf.send_event(options.joining_node, "add_replicas", - "dataset" => options.dataset, - "hosts" => options.other_hosts) -Droonga::Serf.send_event(options.source_node, "add_replicas", - "dataset" => options.dataset, - "hosts" => [options.joining_host]) +Droonga::Serf.send_event(options.joining_node, "join", + "source" => options.replica_source_host, + "copy" => options.copy) puts "Done." -------------- next part -------------- HTML����������������������������...下载
