[Groonga-commit] droonga/droonga-engine at 3d536b3 [master] Output progress while joining

Back to archive index

YUKI Hiroshi null+****@clear*****
Fri Nov 21 20:48:54 JST 2014


YUKI Hiroshi	2014-11-21 20:48:54 +0900 (Fri, 21 Nov 2014)

  New Revision: 3d536b33015341106661f3c6e12922fdad566a12
  https://github.com/droonga/droonga-engine/commit/3d536b33015341106661f3c6e12922fdad566a12

  Message:
    Output progress while joining

  Modified files:
    bin/droonga-engine-join

  Modified: bin/droonga-engine-join (+6 -4)
===================================================================
--- bin/droonga-engine-join    2014-11-21 20:45:40 +0900 (461aa63)
+++ bin/droonga-engine-join    2014-11-21 20:48:54 +0900 (6b914be)
@@ -61,7 +61,7 @@ source_node  = "#{options["replica-source-host"]}:#{options[:port]}/#{options[:t
 def run_remote_command(target, command, options)
   serf = Droonga::Serf.new(nil, target)
   result = serf.send_query(command, options)
-  puts(result[:result])
+  #puts(result[:result])
   puts(result[:error]) unless result[:error].empty?
   result[:response]
 end
@@ -91,8 +91,10 @@ unless options["no-copy"]
     response = run_remote_command(joining_node, "report_status",
                                   "node" => joining_node,
                                   "key"  => "absorbing")
-    absorbing = response["value"]
-    break unless absorbing
+    if response
+      absorbing = response["value"]
+      break unless absorbing
+    end
 
     progress = absorber.report_progress(start_time_in_seconds)
     puts(progress) if progress
@@ -103,8 +105,8 @@ response = run_remote_command(source_node, "report_status",
                               "node" => source_node,
                               "key" => "last_processed_message_timestamp")
 timestamp = response["value"]
-puts "The timestamp of the last processed message in the source node: #{timestamp}"
 if timestamp and not timestamp.empty?
+  puts "The timestamp of the last processed message in the source node: #{timestamp}"
   puts "Setting effective message timestamp for the destination node..."
   response = run_remote_command(destination_node, "set_status",
                                 "node" => destination_node,
-------------- next part --------------
HTML����������������������������...
下載 



More information about the Groonga-commit mailing list
Back to archive index