YUKI Hiroshi
null+****@clear*****
Sun Jun 29 03:06:51 JST 2014
YUKI Hiroshi 2014-06-29 03:06:51 +0900 (Sun, 29 Jun 2014) New Revision: 224ac0aece78823c55968e3b7ba6c7f03a66e411 https://github.com/droonga/droonga-engine/commit/224ac0aece78823c55968e3b7ba6c7f03a66e411 Message: Do absorb via serf event Modified files: bin/droonga-engine-absorb-data lib/droonga/command/serf_event_handler.rb Modified: bin/droonga-engine-absorb-data (+18 -42) =================================================================== --- bin/droonga-engine-absorb-data 2014-06-29 02:48:25 +0900 (a4acbb6) +++ bin/droonga-engine-absorb-data 2014-06-29 03:06:51 +0900 (8258a35) @@ -21,11 +21,12 @@ require "open3" require "droonga/engine/version" require "droonga/catalog_generator" -require "droonga/data_absorber" +require "droonga/serf" options = OpenStruct.new -options.drndump = "drndump" -options.client = "droonga-request" +options.port = Droonga::CatalogGenerator::DEFAULT_PORT +options.tag = Droonga::CatalogGenerator::DEFAULT_TAG +options.dataset = Droonga::CatalogGenerator::DEFAULT_DATASET parser = OptionParser.new parser.version = Droonga::Engine::VERSION @@ -41,7 +42,7 @@ parser.on("--destination-host=HOST", end parser.on("--port=PORT", Integer, "Port number of the source cluster to be connected.", - "(#{Droonga::CatalogGenerator::DEFAULT_PORT})") do |port| + "(#{options.port})") do |port| options.port = port end @@ -49,58 +50,33 @@ parser.separator("") parser.separator("Data:") parser.on("--tag=TAG", "Tag name to be used to communicate with Droonga system.", - "(#{Droonga::CatalogGenerator::DEFAULT_TAG})") do |tag| + "(#{options.tag})") do |tag| options.tag = tag end parser.on("--dataset=DATASET", "Dataset to be absorbed.", - "(#{Droonga::CatalogGenerator::DEFAULT_DATASET})") do |dataset| + "(#{options.dataset})") do |dataset| options.dataset = dataset end -parser.separator("") -parser.separator("Droonga protocol:") -parser.on("--receiver-host=HOST", - "Host name of this node to be received a response from clusters.") do |host| - options.destination_host = host -end -parser.on("--receiver-port=PORT", Integer, - "Port number of this node to be received a response from clusters.") do |port| - options.receiver_port = port -end - -parser.separator("") -parser.separator("Commands:") -parser.on("--drndump=PATH", - "Path to the drndump command.", - "(#{options.client})") do |path| - options.drndump = path -end -parser.on("--droonga-request=PATH", - "Path to the droonga-request command.", - "(#{options.client})") do |path| - options.client = path -end - parser.parse!(ARGV) unless options.source_host raise "You must specify the source host via --source-host option." end unless options.destination_host - raise "You must specify the destination host (this node) " + - "via --destination-host option." + raise "You must specify the destination host via --destination-host option." end -Droonga::DataAbsorber.absorb(:drndump => options.drndump, - :client => options.client, - :dataset => options.dataset, - :source_host => options.source_host, - :destination_host => options.destination_host, - :port => options.port, - :tag => options.tag, - :receiver_port => options.receiver_port) do |dump| - puts dump -end +destination_node = "#{options.destination_host}:#{options.port}/#{options.tag}" + +puts "Absorbing data..." +Droonga::Serf.send_query(destination_node, "absorb_data", + "node" => destination_node, + "source" => options.source_host, + "port" => options.port, + "tag" => options.tag, + "dataset" => options.dataset) +puts "Done." exit(true) Modified: lib/droonga/command/serf_event_handler.rb (+16 -7) =================================================================== --- lib/droonga/command/serf_event_handler.rb 2014-06-29 02:48:25 +0900 (8bd10e4) +++ lib/droonga/command/serf_event_handler.rb 2014-06-29 03:06:51 +0900 (38c463f) @@ -191,18 +191,27 @@ module Droonga end def absorb_data - dataset = @payload["dataset"] - return unless dataset + return unless event_for_me? soruce = @payload["soruce"] return unless soruce - current_catalog = JSON.parse(Path.catalog.read) - generator = CatalogGenerator.new - generator.load(current_catalog) + dataset_name = @payload["dataset"] + port = @payload["port"] + tag = @payload["port"] + + if dataset_name.nil? or port.nil? or tag.nil? + current_catalog = JSON.parse(Path.catalog.read) + generator = CatalogGenerator.new + generator.load(current_catalog) - port = @payload["port"] || generator.datasets[dataset].replicas.port - tag = @payload["tag"] || generator.datasets[dataset].replicas.tag + dataset = generator.dataset_for_host(soruce) + return unless dataset + + dataset_name = dataset.name + port = dataset.replicas.port + tag = dataset.replicas.tag + end DataAbsorber.absorb(:dataset => dataset, :source_host => source, -------------- next part -------------- HTML����������������������������...下载
