Merge pull request #1738 from fluent/fix-heartbeat-tick-check

Move tick check to after heartbeat for avoiding the impact of other node heartbeat. fix #1719
fluent · Nov 7, 2017 · c61cfbf · c61cfbf
2 parents d4e2851 + 59d30bd
commit c61cfbf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/fluent/plugin/out_forward.rb b/lib/fluent/plugin/out_forward.rb
@@ -395,9 +395,6 @@ def rebuild_weight_array
 
     def on_timer
       @nodes.each {|n|
-        if n.tick
-          rebuild_weight_array
-        end
         begin
           log.trace "sending heartbeat", host: n.host, port: n.port, heartbeat_type: @heartbeat_type
           n.usock = @usock if @usock
@@ -407,6 +404,9 @@ def on_timer
         rescue => e
           log.debug "unexpected error happen during heartbeat", host: n.host, port: n.port, heartbeat_type: @heartbeat_type, error: e
         end
+        if n.tick
+          rebuild_weight_array
+        end
       }
     end