fluentd 0.14.10 → 0.14.11

data/test/plugin_helper/test_child_process.rb

@@ -23,6 +23,7 @@ class ChildProcessTest < Test::Unit::TestCase
       @d.shutdown  unless @d.shutdown?
       @d.close     unless @d.closed?
       @d.terminate unless @d.terminated?
+      @d.log.reset
     end
   end
 
@@ -226,55 +227,55 @@ class ChildProcessTest < Test::Unit::TestCase
     end
   end
 
-  unless Fluent.windows?
-    # In windows environment, child_process try KILL at first (because there's no SIGTERM)
-    test 'can execute external command just once, and can terminate it forcedly when shutdown/terminate even if it ignore SIGTERM' do
-      m = Mutex.new
-      ary = []
-      Timeout.timeout(TEST_DEADLOCK_TIMEOUT) do
-        ran = false
-        @d.child_process_execute(:t4, "ruby -e 'Signal.trap(:TERM, nil); while sleep #{TEST_WAIT_INTERVAL_FOR_LOOP}; puts 1; STDOUT.flush rescue nil; end'", mode: [:read]) do |io|
-          m.lock
-          ran = true
-          begin
-            while line = io.readline
-              ary << line
-            end
-          rescue
-            # ignore
-          ensure
-            m.unlock
+  # In windows environment, child_process try KILL at first (because there's no SIGTERM)
+  test 'can execute external command just once, and can terminate it forcedly when shutdown/terminate even if it ignore SIGTERM' do
+    omit "SIGTERM is unavailable on Windows" if Fluent.windows?
+
+    m = Mutex.new
+    ary = []
+    Timeout.timeout(TEST_DEADLOCK_TIMEOUT) do
+      ran = false
+      @d.child_process_execute(:t4, "ruby -e 'Signal.trap(:TERM, nil); while sleep #{TEST_WAIT_INTERVAL_FOR_LOOP}; puts 1; STDOUT.flush rescue nil; end'", mode: [:read]) do |io|
+        m.lock
+        ran = true
+        begin
+          while line = io.readline
+            ary << line
           end
+        rescue
+          # ignore
+        ensure
+          m.unlock
         end
-        sleep TEST_WAIT_INTERVAL_FOR_BLOCK_RUNNING until m.locked? || ran
+      end
+      sleep TEST_WAIT_INTERVAL_FOR_BLOCK_RUNNING until m.locked? || ran
 
-        assert_equal [], @d.log.out.logs
+      assert_equal [], @d.log.out.logs
 
-        @d.stop # nothing occurs
-        sleep TEST_WAIT_INTERVAL_FOR_LOOP * 5
-        lines1 = ary.size
-        assert{ lines1 > 1 }
+      @d.stop # nothing occurs
+      sleep TEST_WAIT_INTERVAL_FOR_LOOP * 5
+      lines1 = ary.size
+      assert{ lines1 > 1 }
 
-        pid = @d._child_process_processes.keys.first
+      pid = @d._child_process_processes.keys.first
 
-        @d.shutdown
-        sleep TEST_WAIT_INTERVAL_FOR_LOOP * 5
-        lines2 = ary.size
-        assert{ lines2 > lines1 }
+      @d.shutdown
+      sleep TEST_WAIT_INTERVAL_FOR_LOOP * 5
+      lines2 = ary.size
+      assert{ lines2 > lines1 }
 
-        @d.close
+      @d.close
 
-        assert_nil((Process.waitpid(pid, Process::WNOHANG) rescue nil))
+      assert_nil((Process.waitpid(pid, Process::WNOHANG) rescue nil))
 
-        @d.terminate
-        assert @d._child_process_processes.empty?
-        begin
-          Process.waitpid(pid)
-        rescue Errno::ECHILD
-        end
-        # Process successfully KILLed if test reaches here
-        assert true
+      @d.terminate
+      assert @d._child_process_processes.empty?
+      begin
+        Process.waitpid(pid)
+      rescue Errno::ECHILD
       end
+      # Process successfully KILLed if test reaches here
+      assert true
     end
   end
 

data/test/plugin_helper/test_storage.rb

@@ -102,7 +102,8 @@ class StorageHelperTest < Test::Unit::TestCase
   test 'can override default configuration parameters, but not overwrite whole definition' do
     d = Dummy.new
     d.configure(config_element())
-    assert_equal [], d.storage_configs
+    assert_equal 1, d.storage_configs.size
+    assert_equal 'local', d.storage_configs.first[:@type]
 
     d = Dummy2.new
     d.configure(config_element('ROOT', '', {}, [config_element('storage', '', {}, [])]))
@@ -130,7 +131,7 @@ class StorageHelperTest < Test::Unit::TestCase
     d = Dummy2.new
     d.configure(config_element())
     assert_raise Fluent::ConfigError.new("@type is required in <storage>") do
-      d.storage_create(conf: config_element('storage', '', {}), default_type: 'ex2')
+      d.storage_create(conf: config_element('storage', 'foo', {}), default_type: 'ex2')
     end
   end
 
@@ -139,7 +140,7 @@ class StorageHelperTest < Test::Unit::TestCase
     assert_nothing_raised do
       d.configure(config_element())
     end
-    assert_equal 0, d._storages.size
+    assert_equal 1, d._storages.size
   end
 
   test 'can be configured with a storage section' do

data/test/test_log.rb

@@ -643,7 +643,7 @@ class PluginLoggerMixinTest < Test::Unit::TestCase
 
   def test_start
     plugin = DummyPlugin.new
-    mock(plugin.log).reset
+    mock(plugin.log).should_receive(:reset).never
     plugin.start
   end
 

data/test/test_output.rb

@@ -246,6 +246,9 @@ module FluentOutputTest
         d.instance.after_start
         d.instance.emit_events('test', OneEventStream.new(event_time("2016-11-08 17:44:30 +0900"), {"message" => "yay"}))
         d.instance.force_flush
+        waiting(10) do
+          sleep 0.1 until d.instance.written_chunk_keys.size == 1
+        end
         assert_equal [], d.instance.errors_in_write
         assert_equal ["2016110808"], d.instance.written_chunk_keys # default timezone is UTC
       end

data/test/test_plugin_id.rb

@@ -0,0 +1,101 @@
+require_relative 'helper'
+require 'fluent/plugin/base'
+require 'fluent/system_config'
+require 'fileutils'
+
+class PluginIdTest < Test::Unit::TestCase
+  TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/tmp/plugin_id/#{ENV['TEST_ENV_NUMBER']}")
+
+  class MyPlugin < Fluent::Plugin::Base
+    include Fluent::PluginId
+  end
+
+  setup do
+    @p = MyPlugin.new
+  end
+
+  sub_test_case '#plugin_id_for_test?' do
+    test 'returns true always in test files' do
+      assert @p.plugin_id_for_test?
+    end
+
+    test 'returns false always out of test files' do
+      # TODO: no good way to write this test....
+    end
+  end
+
+  sub_test_case 'configured without @id' do
+    setup do
+      @p.configure(config_element())
+    end
+
+    test '#plugin_id_configured? returns false' do
+      assert_false @p.plugin_id_configured?
+    end
+
+    test '#plugin_id returns object_id based string' do
+      assert_kind_of String, @p.plugin_id
+      assert @p.plugin_id =~ /^object:[0-9a-f]+/
+    end
+
+    test '#plugin_root_dir returns nil' do
+      assert_nil @p.plugin_root_dir
+    end
+  end
+
+  sub_test_case 'configured with @id' do
+    setup do
+      FileUtils.rm_rf(TMP_DIR)
+      FileUtils.mkdir_p(TMP_DIR)
+      @p.configure(config_element('ROOT', '', {'@id' => 'testing_plugin_id'}))
+    end
+
+    test '#plugin_id_configured? returns true' do
+      assert @p.plugin_id_configured?
+    end
+
+    test '#plugin_id returns the configured value' do
+      assert_equal 'testing_plugin_id', @p.plugin_id
+    end
+
+    test '#plugin_root_dir returns nil without system root directory configuration' do
+      assert_nil @p.plugin_root_dir
+    end
+
+    test '#plugin_root_dir returns an existing directory path frozen String' do
+      root_dir = Fluent::SystemConfig.overwrite_system_config('root_dir' => File.join(TMP_DIR, "myroot")) do
+        @p.plugin_root_dir
+      end
+      assert_kind_of String, root_dir
+      assert Dir.exist?(root_dir)
+      assert root_dir =~ %r!/worker0/!
+      assert root_dir.frozen?
+    end
+
+    test '#plugin_root_dir returns the same value for 2nd or more call' do
+      root_dir = Fluent::SystemConfig.overwrite_system_config('root_dir' => File.join(TMP_DIR, "myroot")) do
+        @p.plugin_root_dir
+      end
+      twice = Fluent::SystemConfig.overwrite_system_config('root_dir' => File.join(TMP_DIR, "myroot")) do
+        @p.plugin_root_dir
+      end
+      assert_equal root_dir.object_id, twice.object_id
+    end
+
+    test '#plugin_root_dir referres SERVERENGINE_WORKER_ID environment path to create it' do
+      prev_env_val = ENV['SERVERENGINE_WORKER_ID']
+      begin
+        ENV['SERVERENGINE_WORKER_ID'] = '7'
+        root_dir = Fluent::SystemConfig.overwrite_system_config('root_dir' => File.join(TMP_DIR, "myroot")) do
+          @p.plugin_root_dir
+        end
+        assert_kind_of String, root_dir
+        assert Dir.exist?(root_dir)
+        assert root_dir =~ %r!/worker7/!
+        assert root_dir.frozen?
+      ensure
+        ENV['SERVERENGINE_WORKER_ID'] = prev_env_val
+      end
+    end
+  end
+end

data/test/test_supervisor.rb

@@ -15,6 +15,7 @@ class SupervisorTest < ::Test::Unit::TestCase
   include WorkerModule
 
   TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/tmp/supervisor#{ENV['TEST_ENV_NUMBER']}")
+  TMP_ROOT_DIR = File.join(TMP_DIR, 'root')
 
   def setup
     FileUtils.rm_rf(TMP_DIR)
@@ -85,6 +86,7 @@ class SupervisorTest < ::Test::Unit::TestCase
   enable_get_dump true
   process_name "process_name"
   log_level info
+  root_dir #{TMP_ROOT_DIR}
 </system>
     EOC
     conf = Fluent::Config.parse(conf_data, "(test)", "(test_dir)", true)
@@ -99,6 +101,7 @@ class SupervisorTest < ::Test::Unit::TestCase
     assert_equal true, sys_conf.enable_get_dump
     assert_equal "process_name", sys_conf.process_name
     assert_equal 2, sys_conf.log_level
+    assert_equal TMP_ROOT_DIR, sys_conf.root_dir
   end
 
   def test_main_process_signal_handlers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.10
+  version: 0.14.11
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -381,6 +381,7 @@ files:
 - lib/fluent/daemon.rb
 - lib/fluent/engine.rb
 - lib/fluent/env.rb
+- lib/fluent/error.rb
 - lib/fluent/event.rb
 - lib/fluent/event_router.rb
 - lib/fluent/filter.rb
@@ -519,6 +520,7 @@ files:
 - lib/fluent/version.rb
 - lib/fluent/winsvc.rb
 - test/command/test_binlog_reader.rb
+- test/command/test_fluentd.rb
 - test/compat/test_calls_super.rb
 - test/compat/test_parser.rb
 - test/config/assertions.rb
@@ -643,6 +645,7 @@ files:
 - test/test_output.rb
 - test/test_plugin_classes.rb
 - test/test_plugin_helper.rb
+- test/test_plugin_id.rb
 - test/test_process.rb
 - test/test_root_agent.rb
 - test/test_supervisor.rb
@@ -676,6 +679,7 @@ specification_version: 4
 summary: Fluentd event collector
 test_files:
 - test/command/test_binlog_reader.rb
+- test/command/test_fluentd.rb
 - test/compat/test_calls_super.rb
 - test/compat/test_parser.rb
 - test/config/assertions.rb
@@ -800,6 +804,7 @@ test_files:
 - test/test_output.rb
 - test/test_plugin_classes.rb
 - test/test_plugin_helper.rb
+- test/test_plugin_id.rb
 - test/test_process.rb
 - test/test_root_agent.rb
 - test/test_supervisor.rb