fluentd 0.14.11 → 0.14.12

data/test/plugin/test_out_forward.rb

@@ -72,7 +72,7 @@ class ForwardOutputTest < Test::Unit::TestCase
     ])
     nodes = d.instance.nodes
     assert_equal 60, d.instance.send_timeout
-    assert_equal :tcp, d.instance.heartbeat_type
+    assert_equal :transport, d.instance.heartbeat_type
     assert_equal 1, nodes.length
     node = nodes.first
     assert_equal "test", node.name
@@ -119,8 +119,8 @@ EOL
     end
   end
 
-  test 'configure_dns_round_robin tcp' do
-    @d = d = create_driver(CONFIG + "\nheartbeat_type tcp\ndns_round_robin true")
+  test 'configure_dns_round_robin transport' do
+    @d = d = create_driver(CONFIG + "\nheartbeat_type transport\ndns_round_robin true")
     assert_equal true, d.instance.dns_round_robin
   end
 
@@ -135,6 +135,24 @@ EOL
     end
   end
 
+  test 'configure with ignore_network_errors_at_startup' do
+    normal_conf = config_element('match', '**', {}, [
+        config_element('server', '', {'name' => 'test', 'host' => 'unexisting.yaaaaaaaaaaaaaay.host.example.com'})
+      ])
+    assert_raise SocketError do
+      create_driver(normal_conf)
+    end
+
+    conf = config_element('match', '**', {'ignore_network_errors_at_startup' => 'true'}, [
+        config_element('server', '', {'name' => 'test', 'host' => 'unexisting.yaaaaaaaaaaaaaay.host.example.com'})
+      ])
+    @d = d = create_driver(conf)
+    expected_log = "failed to resolve node name when configured"
+    expected_detail = 'server="test" error_class=SocketError'
+    logs = d.logs
+    assert{ logs.any?{|log| log.include?(expected_log) && log.include?(expected_detail) } }
+  end
+
   test 'compress_default_value' do
     @d = d = create_driver
     assert_equal :text, d.instance.compress
@@ -199,6 +217,40 @@ EOL
     assert_equal 2, d.instance.ack_response_timeout
   end
 
+  test 'send tags in str (utf-8 strings)' do
+    target_input_driver = create_target_input_driver
+
+    @d = d = create_driver(CONFIG + %[flush_interval 1s])
+
+    time = event_time("2011-01-02 13:14:15 UTC")
+
+    tag_in_utf8 = "test.utf8".encode("utf-8")
+    tag_in_ascii = "test.ascii".encode("ascii-8bit")
+
+    emit_events = [
+      [tag_in_utf8, time, {"a" => 1}],
+      [tag_in_ascii, time, {"a" => 2}],
+    ]
+
+    target_input_driver.run(expect_records: 2) do
+      d.run do
+        emit_events.each do |tag, t, record|
+          d.feed(tag, t, record)
+        end
+      end
+    end
+
+    events = target_input_driver.events
+    assert_equal_event_time(time, events[0][1])
+    assert_equal ['test.utf8', time, emit_events[0][2]], events[0]
+    assert_equal Encoding::UTF_8, events[0][0].encoding
+    assert_equal_event_time(time, events[1][1])
+    assert_equal ['test.ascii', time, emit_events[1][2]], events[1]
+    assert_equal Encoding::UTF_8, events[1][0].encoding
+
+    assert_empty d.instance.exceptions
+  end
+
   test 'send_with_time_as_integer' do
     target_input_driver = create_target_input_driver
 
@@ -587,7 +639,7 @@ EOL
     node = d.instance.nodes.first
     assert_equal Fluent::Plugin::ForwardOutput::NoneHeartbeatNode, node.class
 
-    d.instance.start
+    d.instance_start
     assert_nil d.instance.instance_variable_get(:@loop)   # no HeartbeatHandler, or HeartbeatRequestTimer
     assert_nil d.instance.instance_variable_get(:@thread) # no HeartbeatHandler, or HeartbeatRequestTimer
 
@@ -599,16 +651,16 @@ EOL
   test 'heartbeat_type_udp' do
     @d = d = create_driver(CONFIG + "\nheartbeat_type udp")
 
-    d.instance.start
+    d.instance_start
     usock = d.instance.instance_variable_get(:@usock)
     servers = d.instance.instance_variable_get(:@_servers)
     timers = d.instance.instance_variable_get(:@_timers)
-    assert_equal UDPSocket, usock.class
+    assert_equal Fluent::PluginHelper::Socket::WrappedSocket::UDP, usock.class
+    assert_kind_of UDPSocket, usock
     assert servers.find{|s| s.title == :out_forward_heartbeat_receiver }
     assert timers.include?(:out_forward_heartbeat_request)
 
     mock(usock).send("\0", 0, Socket.pack_sockaddr_in(TARGET_PORT, '127.0.0.1')).once
-    # timer.disable # call send_heartbeat at just once
     d.instance.send(:on_timer)
   end
 

data/test/plugin/test_output.rb

@@ -141,6 +141,10 @@ class OutputTest < Test::Unit::TestCase
       @i = create_output(:full)
     end
 
+    test 'are not available with multi workers configuration in default' do
+      assert_false @i.multi_workers_ready?
+    end
+
     test '#implement? can return features for plugin instances' do
       i1 = FluentPluginOutputTest::DummyBareOutput.new
       assert !i1.implement?(:synchronous)
@@ -820,26 +824,28 @@ class OutputTest < Test::Unit::TestCase
     test '#write flush took longer time than slow_flush_log_threshold' do
       i = create_output(:buffered)
       write_called = false
-      i.register(:write) { |chunk| sleep 1 }
+      i.register(:write) { |chunk| sleep 3 }
       i.define_singleton_method(:test_finished?) { write_called }
       i.define_singleton_method(:try_flush) { super(); write_called = true }
 
       invoke_slow_flush_log_threshold_test(i) {
         assert write_called
-        assert_equal 1, i.log.out.logs.select { |line| line =~ /buffer flush took longer time than slow_flush_log_threshold: elapsed_time/ }.size
+        logs = i.log.out.logs
+        assert{ logs.any?{|log| log.include?("buffer flush took longer time than slow_flush_log_threshold: elapsed_time") } }
       }
     end
 
     test '#try_write flush took longer time than slow_flush_log_threshold' do
       i = create_output(:delayed)
       try_write_called = false
-      i.register(:try_write){ |chunk| sleep 1 }
+      i.register(:try_write){ |chunk| sleep 3 }
       i.define_singleton_method(:test_finished?) { try_write_called }
       i.define_singleton_method(:try_flush) { super(); try_write_called = true }
 
       invoke_slow_flush_log_threshold_test(i) {
         assert try_write_called
-        assert_equal 1, i.log.out.logs.select { |line| line =~ /buffer flush took longer time than slow_flush_log_threshold: elapsed_time/ }.size
+        logs = i.log.out.logs
+        assert{ logs.any?{|log| log.include?("buffer flush took longer time than slow_flush_log_threshold: elapsed_time") } }
       }
     end
   end

data/test/plugin/test_output_as_buffered.rb

@@ -642,6 +642,22 @@ class BufferedOutputTest < Test::Unit::TestCase
         ary.reject!{|e| true }
       end
     end
+  end
+
+  sub_test_case 'with much longer flush_interval' do
+    setup do
+      hash = {
+        'flush_mode' => 'interval',
+        'flush_interval' => 3000,
+        'flush_thread_count' => 1,
+        'flush_thread_burst_interval' => 0.01,
+        'chunk_limit_size' => 1024,
+      }
+      @i = create_output(:buffered)
+      @i.configure(config_element('ROOT','',{},[config_element('buffer','',hash)]))
+      @i.start
+      @i.after_start
+    end
 
     test 'flush_at_shutdown work well when plugin is shutdown' do
       ary = []
@@ -658,16 +674,15 @@ class BufferedOutputTest < Test::Unit::TestCase
       (1024 * 0.9 / event_size).to_i.times do |i|
         @i.emit_events("test.tag", Fluent::ArrayEventStream.new([ [t, r] ]))
       end
-      assert{ @i.buffer.queue.size == 0 && ary.size == 0 }
+      queue_size = @i.buffer.queue.size
+      assert{ queue_size == 0 && ary.size == 0 }
 
       @i.stop
       @i.before_shutdown
       @i.shutdown
       @i.after_shutdown
 
-      waiting(10) do
-        Thread.pass until ary.size == 1
-      end
+      waiting(10){ sleep 0.1 until ary.size == 1 }
       assert_equal [tag,t,r].to_json * (1024 * 0.9 / event_size), ary.first
     end
   end
@@ -730,11 +745,9 @@ class BufferedOutputTest < Test::Unit::TestCase
         assert_equal rand_records, es.size
         @i.emit_events("test.tag", es)
 
-        assert{ @i.buffer.stage.size == 0 && (@i.buffer.queue.size == 1 || @i.buffer.dequeued.size == 1 || ary.size > 0) }
-
-        waiting(10) do
-          Thread.pass until @i.buffer.queue.size == 0 && @i.buffer.dequeued.size == 0
-        end
+        waiting(10){ sleep 0.1 until @i.buffer.stage.size == 0 } # make sure that the emitted es is enqueued by "flush_mode immediate"
+        waiting(10){ sleep 0.1 until @i.buffer.queue.size == 0 && @i.buffer.dequeued.size == 0 }
+        waiting(10){ sleep 0.1 until ary.size == rand_records }
 
         assert_equal rand_records, ary.size
         ary.reject!{|e| true }
@@ -863,12 +876,12 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
 
-      waiting(4) do
-        Thread.pass until @i.write_count > 0
-      end
+      waiting(4){ sleep 0.1 until @i.write_count > 0 }
 
       assert{ @i.buffer.stage.size == 2 && @i.write_count == 1 }
 
+      waiting(4){ sleep 0.1 until ary.size == 3 }
+
       assert_equal 3, ary.size
       assert_equal 2, ary.select{|e| e[0] == "test.tag.1" }.size
       assert_equal 1, ary.select{|e| e[0] == "test.tag.2" }.size
@@ -882,9 +895,7 @@ class BufferedOutputTest < Test::Unit::TestCase
       Timecop.freeze( Time.parse('2016-04-13 14:04:06 +0900') )
 
       @i.enqueue_thread_wait
-      waiting(4) do
-        Thread.pass until @i.write_count > 1
-      end
+      waiting(4){ sleep 0.1 until @i.write_count > 1 }
 
       assert{ @i.buffer.stage.size == 1 && @i.write_count == 2 }
 
@@ -904,7 +915,13 @@ class BufferedOutputTest < Test::Unit::TestCase
       metachecks = []
 
       @i.register(:format){|tag,time,record| [tag,time,record].to_json + "\n" }
-      @i.register(:write){|chunk| chunk.read.split("\n").reject{|l| l.empty? }.each{|data| e = JSON.parse(data); ary << e; metachecks << (chunk.metadata.timekey.to_i <= e[1].to_i && e[1].to_i < chunk.metadata.timekey.to_i + 30) } }
+      @i.register(:write){|chunk|
+        chunk.read.split("\n").reject{|l| l.empty? }.each{|data|
+          e = JSON.parse(data)
+          ary << e
+          metachecks << (chunk.metadata.timekey.to_i <= e[1].to_i && e[1].to_i < chunk.metadata.timekey.to_i + 30)
+        }
+      }
 
       r = {}
       (0...10).each do |i|
@@ -942,9 +959,7 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
 
-      waiting(4) do
-        Thread.pass until @i.write_count > 0
-      end
+      waiting(4){ sleep 0.1 until @i.write_count > 0 }
 
       assert{ @i.buffer.stage.size == 2 && @i.write_count == 1 }
 
@@ -957,14 +972,13 @@ class BufferedOutputTest < Test::Unit::TestCase
       Timecop.freeze( Time.parse('2016-04-13 14:04:06 +0900') )
 
       @i.enqueue_thread_wait
-      waiting(4) do
-        Thread.pass until @i.write_count > 1
-      end
+      waiting(4){ sleep 0.1 until @i.write_count > 1 }
 
       assert{ @i.buffer.stage.size == 1 && @i.write_count == 2 }
 
       Timecop.freeze( Time.parse('2016-04-13 14:04:13 +0900') )
 
+      waiting(4){ sleep 0.1 until ary.size == 9 }
       assert_equal 9, ary.size
 
       @i.stop
@@ -972,9 +986,7 @@ class BufferedOutputTest < Test::Unit::TestCase
       @i.shutdown
       @i.after_shutdown
 
-      waiting(4) do
-        Thread.pass until @i.write_count > 2
-      end
+      waiting(4){ sleep 0.1 until @i.write_count > 2 && ary.size == 11 }
 
       assert_equal 11, ary.size
       assert metachecks.all?{|e| e }

data/test/plugin/test_output_as_buffered_compress.rb

@@ -157,7 +157,7 @@ class BufferedOutputCompressTest < Test::Unit::TestCase
     @i.emit_events('tag', es)
     @i.enqueue_thread_wait
     @i.flush_thread_wakeup
-    waiting(4) { Thread.pass until io.size > 0 }
+    waiting(4) { sleep 0.1 until io.size > 0 }
 
     assert_equal expected, decompress(compressed_data)
     assert_equal expected, io.string

data/test/plugin/test_output_as_buffered_retries.rb

@@ -687,7 +687,7 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > 0 && @i.num_errors > 0 }
+      waiting(4){ sleep 0.1 until @i.write_count > 0 && @i.num_errors > 0 }
 
       assert{ @i.buffer.queue.size > 0 }
       assert{ @i.buffer.queue.first.metadata.tag == 'test.tag.1' }
@@ -703,10 +703,10 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
       15.times do |i|
         now = @i.next_flush_time
 
-        Timecop.freeze( now )
+        Timecop.freeze( now + 1 )
         @i.enqueue_thread_wait
         @i.flush_thread_wakeup
-        waiting(4){ Thread.pass until @i.write_count > prev_write_count && @i.num_errors > prev_num_errors }
+        waiting(4){ sleep 0.1 until @i.write_count > prev_write_count && @i.num_errors > prev_num_errors }
 
         assert{ @i.write_count > prev_write_count }
         assert{ @i.num_errors > prev_num_errors }
@@ -758,7 +758,7 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > 0 && @i.num_errors > 0 }
+      waiting(4){ sleep 0.1 until @i.write_count > 0 && @i.num_errors > 0 }
 
       assert{ @i.buffer.queue.size > 0 }
       assert{ @i.buffer.queue.first.metadata.tag == 'test.tag.1' }
@@ -774,10 +774,10 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
       15.times do |i|
         now = @i.next_flush_time
 
-        Timecop.freeze( now )
+        Timecop.freeze( now + 1 )
         @i.enqueue_thread_wait
         @i.flush_thread_wakeup
-        waiting(4){ Thread.pass until @i.write_count > prev_write_count && @i.num_errors > prev_num_errors }
+        waiting(4){ sleep 0.1 until @i.write_count > prev_write_count && @i.num_errors > prev_num_errors }
 
         assert{ @i.write_count > prev_write_count }
         assert{ @i.num_errors > prev_num_errors }

data/test/plugin/test_output_as_buffered_secondary.rb

@@ -230,7 +230,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > 0 && @i.num_errors > 0 }
+      waiting(4){ sleep 0.1 until @i.write_count > 0 && @i.num_errors > 0 }
 
       assert{ @i.buffer.queue.size > 0 }
       assert{ @i.buffer.queue.first.metadata.tag == 'test.tag.1' }
@@ -244,16 +244,30 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
       first_failure = @i.retry.start
 
       # retry_timeout == 60(sec), retry_secondary_threshold == 0.8
+      now = first_failure + 60 * 0.8 + 1 # to step from primary to secondary
+      Timecop.freeze( now )
 
-      now = first_failure + 60 * 0.8 + 1
+      unless @i.retry.secondary?
+        @i.enqueue_thread_wait
+        @i.flush_thread_wakeup
+        waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
+
+        prev_write_count = @i.write_count
+        prev_num_errors = @i.num_errors
+
+        # next step is on secondary
+        now = first_failure + 60 * 0.8 + 10
+        Timecop.freeze( now )
+      end
 
-      Timecop.freeze( now )
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > prev_write_count }
+      waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
 
-      assert{ @i.write_count > prev_write_count }
-      assert{ @i.num_errors == prev_num_errors }
+      current_write_count = @i.write_count
+      current_num_errors = @i.num_errors
+      assert{ current_write_count > prev_write_count }
+      assert{ current_num_errors == prev_num_errors }
 
       assert_nil @i.retry
 
@@ -261,7 +275,9 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
       assert_equal [ 'test.tag.1', event_time('2016-04-13 18:33:13').to_i, {"name" => "moris", "age" => 36, "message" => "data2"} ], written[1]
       assert_equal [ 'test.tag.1', event_time('2016-04-13 18:33:32').to_i, {"name" => "moris", "age" => 36, "message" => "data3"} ], written[2]
 
-      assert{ @i.log.out.logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
+      logs = @i.log.out.logs
+      waiting(4){ sleep 0.1 until logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
+      assert{ logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
     end
 
     test 'secondary can do non-delayed commit even if primary do delayed commit' do
@@ -295,7 +311,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > 0 && @i.num_errors > 0 }
+      waiting(4){ sleep 0.1 until @i.write_count > 0 && @i.num_errors > 0 }
 
       assert{ @i.buffer.queue.size > 0 }
       assert{ @i.buffer.queue.first.metadata.tag == 'test.tag.1' }
@@ -309,13 +325,25 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
       first_failure = @i.retry.start
 
       # retry_timeout == 60(sec), retry_secondary_threshold == 0.8
+      now = first_failure + 60 * 0.8 + 1 # to step from primary to secondary
+      Timecop.freeze( now )
 
-      now = first_failure + 60 * 0.8 + 1
+      unless @i.retry.secondary?
+        @i.enqueue_thread_wait
+        @i.flush_thread_wakeup
+        waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
+
+        prev_write_count = @i.write_count
+        prev_num_errors = @i.num_errors
+
+        # next step is on secondary
+        now = first_failure + 60 * 0.8 + 10
+        Timecop.freeze( now )
+      end
 
-      Timecop.freeze( now )
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > prev_write_count }
+      waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
 
       assert{ @i.write_count > prev_write_count }
       assert{ @i.num_errors == prev_num_errors }
@@ -326,7 +354,9 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
       assert_equal [ 'test.tag.1', event_time('2016-04-13 18:33:13').to_i, {"name" => "moris", "age" => 36, "message" => "data2"} ], written[1]
       assert_equal [ 'test.tag.1', event_time('2016-04-13 18:33:32').to_i, {"name" => "moris", "age" => 36, "message" => "data3"} ], written[2]
 
-      assert{ @i.log.out.logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
+      logs = @i.log.out.logs
+      waiting(4){ sleep 0.1 until logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
+      assert{ logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
     end
 
     test 'secondary plugin can do delayed commit if primary do it' do
@@ -361,7 +391,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > 0 && @i.num_errors > 0 }
+      waiting(4){ sleep 0.1 until @i.write_count > 0 && @i.num_errors > 0 }
 
       assert{ @i.buffer.queue.size > 0 }
       assert{ @i.buffer.queue.first.metadata.tag == 'test.tag.1' }
@@ -375,13 +405,25 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
       first_failure = @i.retry.start
 
       # retry_timeout == 60(sec), retry_secondary_threshold == 0.8
+      now = first_failure + 60 * 0.8 + 1 # to step from primary to secondary
+      Timecop.freeze( now )
 
-      now = first_failure + 60 * 0.8 + 1
+      unless @i.retry.secondary?
+        @i.enqueue_thread_wait
+        @i.flush_thread_wakeup
+        waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
+
+        prev_write_count = @i.write_count
+        prev_num_errors = @i.num_errors
+
+        # next step is on secondary
+        now = first_failure + 60 * 0.8 + 10
+        Timecop.freeze( now )
+      end
 
-      Timecop.freeze( now )
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > prev_write_count }
+      waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
 
       assert{ @i.write_count > prev_write_count }
       assert{ @i.num_errors == prev_num_errors }
@@ -403,7 +445,9 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       assert_nil @i.retry
 
-      assert{ @i.log.out.logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
+      logs = @i.log.out.logs
+      waiting(4){ sleep 0.1 until logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
+      assert{ logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
     end
 
     test 'secondary plugin can do delayed commit even if primary does not do it' do
@@ -438,7 +482,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > 0 && @i.num_errors > 0 }
+      waiting(4){ sleep 0.1 until @i.write_count > 0 && @i.num_errors > 0 }
 
       assert{ @i.buffer.queue.size > 0 }
       assert{ @i.buffer.queue.first.metadata.tag == 'test.tag.1' }
@@ -452,13 +496,25 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
       first_failure = @i.retry.start
 
       # retry_timeout == 60(sec), retry_secondary_threshold == 0.8
+      now = first_failure + 60 * 0.8 + 1 # to step from primary to secondary
+      Timecop.freeze( now )
 
-      now = first_failure + 60 * 0.8 + 1
+      unless @i.retry.secondary?
+        @i.enqueue_thread_wait
+        @i.flush_thread_wakeup
+        waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
+
+        prev_write_count = @i.write_count
+        prev_num_errors = @i.num_errors
+
+        # next step is on secondary
+        now = first_failure + 60 * 0.8 + 10
+        Timecop.freeze( now )
+      end
 
-      Timecop.freeze( now )
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > prev_write_count }
+      waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
 
       assert{ @i.write_count > prev_write_count }
       assert{ @i.num_errors == prev_num_errors }
@@ -480,7 +536,9 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       assert_nil @i.retry
 
-      assert{ @i.log.out.logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
+      logs = @i.log.out.logs
+      waiting(4){ sleep 0.1 until logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
+      assert{ logs.any?{|l| l.include?("[warn]: retry succeeded by secondary.") } }
     end
 
     test 'secondary plugin can do delayed commit even if primary does not do it, and non-committed chunks will be rollbacked by primary' do
@@ -515,7 +573,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > 0 && @i.num_errors > 0 }
+      waiting(4){ sleep 0.1 until @i.write_count > 0 && @i.num_errors > 0 }
 
       assert{ @i.buffer.queue.size == 2 }
       assert{ @i.buffer.queue.first.metadata.tag == 'test.tag.1' }
@@ -539,7 +597,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
 
-      waiting(4){ Thread.pass until chunks.size == 2 }
+      waiting(4){ sleep 0.1 until chunks.size == 2 }
 
       assert{ @i.write_count > prev_write_count }
       assert{ @i.num_errors == prev_num_errors }
@@ -568,6 +626,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       assert @i.retry
       logs = @i.log.out.logs
+      waiting(4){ sleep 0.1 until logs.select{|l| l.include?("[warn]: failed to flush the buffer chunk, timeout to commit.") }.size == 2 }
       assert{ logs.select{|l| l.include?("[warn]: failed to flush the buffer chunk, timeout to commit.") }.size == 2 }
     end
 
@@ -601,7 +660,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > 0 && @i.num_errors > 0 }
+      waiting(4){ sleep 0.1 until @i.write_count > 0 && @i.num_errors > 0 }
 
       assert{ @i.buffer.queue.size > 0 }
       assert{ @i.buffer.queue.first.metadata.tag == 'test.tag.1' }
@@ -621,7 +680,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
       Timecop.freeze( now )
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > prev_write_count }
+      waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
 
       assert{ @i.write_count > prev_write_count }
       assert{ @i.num_errors > prev_num_errors }
@@ -631,6 +690,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
       assert_equal 3, (@i.next_flush_time - Time.now)
 
       logs = @i.log.out.logs
+      waiting(4){ sleep 0.1 until logs.any?{|l| l.include?("[warn]: failed to flush the buffer with secondary output.") } }
       assert{ logs.any?{|l| l.include?("[warn]: failed to flush the buffer with secondary output.") } }
     end
   end
@@ -672,7 +732,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > 0 && @i.num_errors > 0 }
+      waiting(4){ sleep 0.1 until @i.write_count > 0 && @i.num_errors > 0 }
 
       assert{ @i.buffer.queue.size > 0 }
       assert{ @i.buffer.queue.first.metadata.tag == 'test.tag.1' }
@@ -690,7 +750,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
         Timecop.freeze( now )
         @i.enqueue_thread_wait
         @i.flush_thread_wakeup
-        waiting(4){ Thread.pass until @i.write_count > prev_write_count }
+        waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
 
         assert{ @i.write_count > prev_write_count }
 
@@ -743,7 +803,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       @i.enqueue_thread_wait
       @i.flush_thread_wakeup
-      waiting(4){ Thread.pass until @i.write_count > 0 && @i.num_errors > 0 }
+      waiting(4){ sleep 0.1 until @i.write_count > 0 && @i.num_errors > 0 }
 
       assert{ @i.buffer.queue.size > 0 }
       assert{ @i.buffer.queue.first.metadata.tag == 'test.tag.1' }
@@ -768,7 +828,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
         Timecop.freeze( now )
         @i.enqueue_thread_wait
         @i.flush_thread_wakeup
-        waiting(4){ Thread.pass until @i.write_count > prev_write_count }
+        waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
 
         assert{ @i.write_count > prev_write_count }
         assert{ @i.num_errors > prev_num_errors }
@@ -800,7 +860,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
         Timecop.freeze( now )
         @i.enqueue_thread_wait
         @i.flush_thread_wakeup
-        waiting(4){ Thread.pass until @i.write_count > prev_write_count }
+        waiting(4){ sleep 0.1 until @i.write_count > prev_write_count }
 
         assert{ @i.write_count > prev_write_count }
         assert{ @i.num_errors > prev_num_errors }