fluentd 1.17.1-x86-mingw32 → 1.19.0-x86-mingw32

data/lib/fluent/command/fluentd.rb

@@ -46,7 +46,7 @@ op.on('--show-plugin-config=PLUGIN', "[DEPRECATED] Show PLUGIN configuration and
 }
 
 op.on('-p', '--plugin DIR', "add plugin directory") {|s|
-  (cmd_opts[:plugin_dirs] ||= []) << s
+  (cmd_opts[:plugin_dirs] ||= default_opts[:plugin_dirs]) << s
 }
 
 op.on('-I PATH', "add library path") {|s|
@@ -127,7 +127,13 @@ op.on('--without-source', "invoke a fluentd without input plugins", TrueClass) {
   cmd_opts[:without_source] = b
 }
 
-op.on('--config-file-type VALU', 'guessing file type of fluentd configuration. yaml/yml or guess') { |s|
+unless Fluent.windows?
+  op.on('--with-source-only', "Invoke a fluentd only with input plugins. The data is stored in a temporary buffer. Send SIGWINCH to cancel this mode and process the data (Not supported on Windows).", TrueClass) {|b|
+    cmd_opts[:with_source_only] = b
+  }
+end
+
+op.on('--config-file-type VALUE', 'guessing file type of fluentd configuration. yaml/yml or guess') { |s|
   if (s == 'yaml') || (s == 'yml')
     cmd_opts[:config_file_type] = s.to_sym
   elsif (s == 'guess')
@@ -149,7 +155,11 @@ op.on('--strict-config-value', "Parse config values strictly", TrueClass) {|b|
   cmd_opts[:strict_config_value] = b
 }
 
-op.on('--enable-input-metrics', "Enable input plugin metrics on fluentd", TrueClass) {|b|
+op.on('--enable-input-metrics', "[DEPRECATED] Enable input plugin metrics on fluentd", TrueClass) {|b|
+  cmd_opts[:enable_input_metrics] = b
+}
+
+op.on('--disable-input-metrics', "Disable input plugin metrics on fluentd", FalseClass) {|b|
   cmd_opts[:enable_input_metrics] = b
 }
 

data/lib/fluent/compat/formatter.rb

@@ -101,6 +101,12 @@ module Fluent
 
       class CsvFormatter < Fluent::Plugin::CsvFormatter
         # TODO: warn when deprecated
+
+        # Do not cache because it is hard to consider the thread key correctly.
+        # (We can try, but it would be low priority.)
+        def csv_cacheable?
+          false
+        end
       end
 
       class SingleValueFormatter < Fluent::Plugin::SingleValueFormatter

data/lib/fluent/compat/socket_util.rb

@@ -129,7 +129,7 @@ module Fluent
 
         def shutdown
           @loop.watchers.each { |w| w.detach }
-          @loop.stop if @loop.instance_variable_get("@running")
+          @loop.stop if @loop.instance_variable_get(:@running)
           @handler.close
           @thread.join
 
@@ -148,7 +148,7 @@ module Fluent
         def on_message(msg, addr)
           @parser.parse(msg) { |time, record|
             unless time && record
-              log.warn "pattern not matched: #{msg.inspect}"
+              log.warn { "pattern not matched: #{msg.inspect}" }
               return
             end
 

data/lib/fluent/config/configure_proxy.rb

@@ -47,7 +47,7 @@ module Fluent
         #   should override "@name".
         @root_section = root
 
-        @param_name = param_name && param_name.to_sym
+        @param_name = param_name&.to_sym
         @init = init
         @required = required
         @multi = multi

data/lib/fluent/config/element.rb

@@ -31,7 +31,7 @@ module Fluent
         @unused = unused || attrs.keys
         @v1_config = false
         @corresponding_proxies = [] # some plugins use flat parameters, e.g. in_http doesn't provide <format> section for parser.
-        @unused_in = nil # if this element is not used in plugins, correspoing plugin name and parent element name is set, e.g. [source, plugin class].
+        @unused_in = nil # if this element is not used in plugins, corresponding plugin name and parent element name is set, e.g. [source, plugin class].
 
         # it's global logger, not plugin logger: deprecated message should be global warning, not plugin level.
         @logger = defined?($log) ? $log : nil
@@ -73,7 +73,7 @@ module Fluent
 
       def inspect
         attrs = super
-        "name:#{@name}, arg:#{@arg}, " + attrs + ", " + @elements.inspect
+        "<name:#{@name}, arg:#{@arg}, attrs:#{attrs}, elements:#{@elements.inspect}>"
       end
 
       # Used by PP and Pry

data/lib/fluent/config/literal_parser.rb

@@ -98,11 +98,11 @@ module Fluent
             else
               return string.join
             end
-          elsif check(/[^"]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/)
-            if s = check(/[^\\]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/)
+          elsif check(/[^"]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/o)
+            if s = check(/[^\\]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/o)
               string << s
             end
-            skip(/[^"]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/)
+            skip(/[^"]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/o)
           elsif s = scan(/\\./)
             string << eval_escape_char(s[1,1])
           elsif skip(/\#\{/)
@@ -254,8 +254,15 @@ EOM
               buffer << line_buffer + "\n"
               line_buffer = ""
             else
-              # '#' is a char in json string
-              line_buffer << char
+              if @ss.exist?(/^\{[^}]+\}/)
+                # if it's interpolated string
+                skip(/\{/)
+                line_buffer << eval_embedded_code(scan_embedded_code)
+                skip(/\}/)
+              else
+                # '#' is a char in json string
+                line_buffer << char
+              end
             end
 
             next # This char '#' MUST NOT terminate json object.

data/lib/fluent/config/parser.rb

@@ -92,10 +92,23 @@ module Fluent
         else
           basepath = '/'
           fname = path
-          require 'open-uri'
-          URI.open(uri) {|f|
+          parser_proc = ->(f) {
             Parser.new(basepath, f.each_line, fname).parse!(allow_include, nil, attrs, elems)
           }
+
+          case u.scheme
+          when 'http', 'https', 'ftp'
+            # URI#open can be able to handle URIs for http, https and ftp.
+            require 'open-uri'
+            u.open(&parser_proc)
+          else
+            # TODO: This case should be handled in the previous if condition. Glob is not applied to some Windows path formats.
+            # 'c:/path/to/file' will be passed as URI, 'uri' and 'u.path' will be:
+            #   - uri is 'c:/path/to/file'
+            #   - u.path is '/path/to/file' and u.scheme is 'c'
+            # Therefore, the condition of the if statement above is not met and it is handled here.
+            File.open(uri, &parser_proc)
+          end
         end
 
       rescue SystemCallError => e
@@ -104,4 +117,3 @@ module Fluent
     end
   end
 end
-

data/lib/fluent/config/section.rb

@@ -150,7 +150,7 @@ module Fluent
             end
           end
           unless section_params.has_key?(proxy.argument.first)
-            logger.error "config error in:\n#{conf}" if logger # logger should exist, but somethimes it's nil (e.g, in tests)
+            logger.error "config error in:\n#{conf}" if logger # logger should exist, but sometimes it's nil (e.g, in tests)
             raise ConfigError, "'<#{proxy.name} ARG>' section requires argument" + section_stack
           end
           # argument should NOT be deprecated... (argument always has a value: '')
@@ -253,7 +253,7 @@ module Fluent
         elems = conf.respond_to?(:elements) ? conf.elements : []
         elems.each { |e|
           next if plugin_class.nil? && Fluent::Config::V1Parser::ELEM_SYMBOLS.include?(e.name) # skip pre-defined non-plugin elements because it doesn't have proxy section
-          next if e.unused_in && e.unused_in.empty? # the section is used at least once
+          next if e.unused_in&.empty? # the section is used at least once
 
           if proxy.sections.any? { |name, subproxy| e.name == subproxy.name.to_s || e.name == subproxy.alias.to_s }
             e.unused_in = []

data/lib/fluent/config/types.rb

@@ -71,7 +71,7 @@ module Fluent
       else
         # Current parser passes comment without actual values, e.g. "param #foo".
         # parser should pass empty string in this case but changing behaviour may break existing environment so keep parser behaviour. Just ignore comment value in boolean handling for now.
-        if str.respond_to?('start_with?') && str.start_with?('#')
+        if str.respond_to?(:start_with?) && str.start_with?('#')
           true
         elsif opts[:strict]
           raise Fluent::ConfigError, "#{name}: invalid bool value: #{str}"

data/lib/fluent/config/v1_parser.rb

@@ -83,7 +83,7 @@ module Fluent
           elsif skip(/\</)
             e_name = scan(ELEMENT_NAME)
             spacing
-            e_arg = scan_string(/(?:#{ZERO_OR_MORE_SPACING}\>)/)
+            e_arg = scan_string(/(?:#{ZERO_OR_MORE_SPACING}\>)/o)
             spacing
             unless skip(/\>/)
               parse_error! "expected '>'"
@@ -98,7 +98,7 @@ module Fluent
             new_e.v1_config = true
             elems << new_e
 
-          elsif root_element && skip(/(\@include|include)#{SPACING}/)
+          elsif root_element && skip(/(\@include|include)#{SPACING}/o)
             if !prev_match.start_with?('@')
               @logger.warn "'include' is deprecated. Use '@include' instead" if @logger
             end
@@ -172,7 +172,7 @@ module Fluent
           require 'open-uri'
           basepath = '/'
           fname = path
-          data = URI.open(uri) { |f| f.read }
+          data = u.open { |f| f.read }
           data.force_encoding('UTF-8')
           ss = StringScanner.new(data)
           V1Parser.new(ss, basepath, fname, @eval_context).parse_element(true, nil, attrs, elems)

data/lib/fluent/counter/store.rb

@@ -156,7 +156,7 @@ module Fluent
         }
       end
 
-      # value is Hash. value requires these fileds.
+      # value is Hash. value requires these fields.
       # :name, :total, :current, :type, :reset_interval, :last_reset_at, :last_modified_at
       def build_value(data)
         type = data['type'] || 'numeric'

data/lib/fluent/engine.rb

@@ -43,13 +43,15 @@ module Fluent
       @system_config = SystemConfig.new
 
       @supervisor_mode = false
+
+      @root_agent_mutex = Mutex.new
     end
 
     MAINLOOP_SLEEP_INTERVAL = 0.3
 
     attr_reader :root_agent, :system_config, :supervisor_mode
 
-    def init(system_config, supervisor_mode: false)
+    def init(system_config, supervisor_mode: false, start_in_parallel: false)
       @system_config = system_config
       @supervisor_mode = supervisor_mode
 
@@ -58,7 +60,7 @@ module Fluent
 
       @log_event_verbose = system_config.log_event_verbose unless system_config.log_event_verbose.nil?
 
-      @root_agent = RootAgent.new(log: log, system_config: @system_config)
+      @root_agent = RootAgent.new(log: log, system_config: @system_config, start_in_parallel: start_in_parallel)
 
       self
     end
@@ -133,7 +135,15 @@ module Fluent
     end
 
     def flush!
-      @root_agent.flush!
+      @root_agent_mutex.synchronize do
+        @root_agent.flush!
+      end
+    end
+
+    def cancel_source_only!
+      @root_agent_mutex.synchronize do
+        @root_agent.cancel_source_only!
+      end
     end
 
     def now
@@ -144,7 +154,9 @@ module Fluent
     def run
       begin
         $log.info "starting fluentd worker", pid: Process.pid, ppid: Process.ppid, worker: worker_id
-        start
+        @root_agent_mutex.synchronize do
+          start
+        end
 
         @fluent_log_event_router.start
 
@@ -158,47 +170,51 @@ module Fluent
         raise
       end
 
-      stop_phase(@root_agent)
+      @root_agent_mutex.synchronize do
+        stop_phase(@root_agent)
+      end
     end
 
     # @param conf [Fluent::Config]
     # @param supervisor [Bool]
-    # @reutrn nil
+    # @return nil
     def reload_config(conf, supervisor: false)
-      # configure first to reduce down time while restarting
-      new_agent = RootAgent.new(log: log, system_config: @system_config)
-      ret = Fluent::StaticConfigAnalysis.call(conf, workers: system_config.workers)
-
-      ret.all_plugins.each do |plugin|
-        if plugin.respond_to?(:reloadable_plugin?) && !plugin.reloadable_plugin?
-          raise Fluent::ConfigError, "Unreloadable plugin plugin: #{Fluent::Plugin.lookup_type_from_class(plugin.class)}, plugin_id: #{plugin.plugin_id}, class_name: #{plugin.class})"
+      @root_agent_mutex.synchronize do
+        # configure first to reduce down time while restarting
+        new_agent = RootAgent.new(log: log, system_config: @system_config)
+        ret = Fluent::StaticConfigAnalysis.call(conf, workers: system_config.workers)
+
+        ret.all_plugins.each do |plugin|
+          if plugin.respond_to?(:reloadable_plugin?) && !plugin.reloadable_plugin?
+            raise Fluent::ConfigError, "Unreloadable plugin plugin: #{Fluent::Plugin.lookup_type_from_class(plugin.class)}, plugin_id: #{plugin.plugin_id}, class_name: #{plugin.class})"
+          end
         end
-      end
 
-      # Assign @root_agent to new root_agent
-      # for https://github.com/fluent/fluentd/blob/fcef949ce40472547fde295ddd2cfe297e1eddd6/lib/fluent/plugin_helper/event_emitter.rb#L50
-      old_agent, @root_agent = @root_agent, new_agent
-      begin
-        @root_agent.configure(conf)
-      rescue
-        @root_agent = old_agent
-        raise
-      end
+        # Assign @root_agent to new root_agent
+        # for https://github.com/fluent/fluentd/blob/fcef949ce40472547fde295ddd2cfe297e1eddd6/lib/fluent/plugin_helper/event_emitter.rb#L50
+        old_agent, @root_agent = @root_agent, new_agent
+        begin
+          @root_agent.configure(conf)
+        rescue
+          @root_agent = old_agent
+          raise
+        end
 
-      unless @suppress_config_dump
-        $log.info :supervisor, "using configuration file: #{conf.to_s.rstrip}"
-      end
+        unless @suppress_config_dump
+          $log.info :supervisor, "using configuration file: #{conf.to_s.rstrip}"
+        end
 
-      # supervisor doesn't handle actual data. so the following code is unnecessary.
-      if supervisor
-        old_agent.shutdown      # to close thread created in #configure
-        return
-      end
+        # supervisor doesn't handle actual data. so the following code is unnecessary.
+        if supervisor
+          old_agent.shutdown      # to close thread created in #configure
+          return
+        end
 
-      stop_phase(old_agent)
+        stop_phase(old_agent)
 
-      $log.info 'restart fluentd worker', worker: worker_id
-      start_phase(new_agent)
+        $log.info 'restart fluentd worker', worker: worker_id
+        start_phase(new_agent)
+      end
     end
 
     def stop

data/lib/fluent/env.rb

@@ -14,27 +14,31 @@
 #    limitations under the License.
 #
 
+require 'securerandom'
+
 require 'serverengine/utils'
 require 'fluent/oj_options'
 
 module Fluent
   DEFAULT_CONFIG_PATH = ENV['FLUENT_CONF'] || '/etc/fluent/fluent.conf'
+  DEFAULT_CONFIG_INCLUDE_DIR = ENV["FLUENT_CONF_INCLUDE_DIR"] || '/etc/fluent/conf.d'
   DEFAULT_PLUGIN_DIR = ENV['FLUENT_PLUGIN'] || '/etc/fluent/plugin'
   DEFAULT_SOCKET_PATH = ENV['FLUENT_SOCKET'] || '/var/run/fluent/fluent.sock'
   DEFAULT_BACKUP_DIR = ENV['FLUENT_BACKUP_DIR'] || '/tmp/fluent'
   DEFAULT_OJ_OPTIONS = Fluent::OjOptions.load_env
   DEFAULT_DIR_PERMISSION = 0755
   DEFAULT_FILE_PERMISSION = 0644
+  INSTANCE_ID = ENV['FLUENT_INSTANCE_ID'] || SecureRandom.uuid
 
   def self.windows?
     ServerEngine.windows?
   end
 
   def self.linux?
-    /linux/ === RUBY_PLATFORM
+    RUBY_PLATFORM.include?("linux")
   end
 
   def self.macos?
-    /darwin/ =~ RUBY_PLATFORM
+    RUBY_PLATFORM.include?("darwin")
   end
 end

data/lib/fluent/event.rb

@@ -62,9 +62,9 @@ module Fluent
       out.full_pack
     end
 
-    def to_compressed_msgpack_stream(time_int: false, packer: nil)
+    def to_compressed_msgpack_stream(time_int: false, packer: nil, type: :gzip)
       packed = to_msgpack_stream(time_int: time_int, packer: packer)
-      compress(packed)
+      compress(packed, type: type)
     end
 
     def to_msgpack_stream_forced_integer(packer: nil)
@@ -247,7 +247,7 @@ module Fluent
     end
 
     # This method returns MultiEventStream, because there are no reason
-    # to surve binary serialized by msgpack.
+    # to survey binary serialized by msgpack.
     def slice(index, num)
       ensure_unpacked!
       MultiEventStream.new(@unpacked_times.slice(index, num), @unpacked_records.slice(index, num))
@@ -268,10 +268,11 @@ module Fluent
   end
 
   class CompressedMessagePackEventStream < MessagePackEventStream
-    def initialize(data, cached_unpacker = nil, size = 0, unpacked_times: nil, unpacked_records: nil)
-      super
+    def initialize(data, cached_unpacker = nil, size = 0, unpacked_times: nil, unpacked_records: nil, compress: :gzip)
+      super(data, cached_unpacker, size, unpacked_times: unpacked_times, unpacked_records: unpacked_records)
       @decompressed_data = nil
       @compressed_data = data
+      @type = compress
     end
 
     def empty?
@@ -303,7 +304,7 @@ module Fluent
 
     def ensure_decompressed!
       return if @decompressed_data
-      @data = @decompressed_data = decompress(@data)
+      @data = @decompressed_data = decompress(@data, type: @type)
     end
   end
 

data/lib/fluent/event_router.rb

@@ -286,7 +286,7 @@ module Fluent
 
     def find(tag)
       pipeline = nil
-      @match_rules.each_with_index { |rule, i|
+      @match_rules.each do |rule|
         if rule.match?(tag)
           if rule.collector.is_a?(Plugin::Filter)
             pipeline ||= Pipeline.new
@@ -301,7 +301,7 @@ module Fluent
             return pipeline
           end
         end
-      }
+      end
 
       if pipeline
         # filter is matched but no match

data/lib/fluent/log/console_adapter.rb

@@ -19,11 +19,9 @@ require 'console'
 module Fluent
   class Log
     # Async gem which is used by http_server helper switched logger mechanism to
-    # Console gem which isn't complatible with Ruby's standard Logger (since
+    # Console gem which isn't compatible with Ruby's standard Logger (since
     # v1.17). This class adapts it to Fluentd's logger mechanism.
-    class ConsoleAdapter < Gem::Version.new(Console::VERSION) >= Gem::Version.new("1.25") ?
-      Console::Output::Terminal : Console::Terminal::Logger
-
+    class ConsoleAdapter < Console::Output::Terminal
       def self.wrap(logger)
         _, level = Console::Logger::LEVELS.find { |key, value|
           if logger.level <= 0
@@ -58,10 +56,10 @@ module Fluent
           level = 'warn'
         end
 
-        @io.seek(0)
-        @io.truncate(0)
+        @stream.seek(0)
+        @stream.truncate(0)
         super
-        @logger.send(level, @io.string.chomp)
+        @logger.send(level, @stream.string.chomp)
       end
     end
   end

data/lib/fluent/log.rb

@@ -138,6 +138,7 @@ module Fluent
       @optional_attrs = nil
 
       @suppress_repeated_stacktrace = opts[:suppress_repeated_stacktrace]
+      @forced_stacktrace_level = nil
       @ignore_repeated_log_interval = opts[:ignore_repeated_log_interval]
       @ignore_same_log_interval = opts[:ignore_same_log_interval]
 
@@ -173,6 +174,7 @@ module Fluent
       clone.format = @format
       clone.time_format = @time_format
       clone.log_event_enabled = @log_event_enabled
+      clone.force_stacktrace_level(@forced_stacktrace_level)
       # optional headers/attrs are not copied, because new PluginLogger should have another one of it
       clone
     end
@@ -240,6 +242,14 @@ module Fluent
       nil
     end
 
+    def force_stacktrace_level?
+      not @forced_stacktrace_level.nil?
+    end
+
+    def force_stacktrace_level(level)
+      @forced_stacktrace_level = level
+    end
+
     def enable_debug(b=true)
       @debug_mode = b
       self
@@ -500,6 +510,16 @@ module Fluent
     def dump_stacktrace(type, backtrace, level)
       return if @level > level
 
+      dump_stacktrace_internal(
+        type,
+        backtrace,
+        force_stacktrace_level? ? @forced_stacktrace_level : level,
+      )
+    end
+
+    def dump_stacktrace_internal(type, backtrace, level)
+      return if @level > level
+
       time = Time.now
 
       if @format == :text
@@ -633,6 +653,9 @@ module Fluent
       if logger.instance_variable_defined?(:@suppress_repeated_stacktrace)
         @suppress_repeated_stacktrace = logger.instance_variable_get(:@suppress_repeated_stacktrace)
       end
+      if logger.instance_variable_defined?(:@forced_stacktrace_level)
+        @forced_stacktrace_level = logger.instance_variable_get(:@forced_stacktrace_level)
+      end
       if logger.instance_variable_defined?(:@ignore_repeated_log_interval)
         @ignore_repeated_log_interval = logger.instance_variable_get(:@ignore_repeated_log_interval)
       end

data/lib/fluent/plugin/bare_output.rb

@@ -40,22 +40,6 @@ module Fluent
         raise NotImplementedError, "BUG: output plugins MUST implement this method"
       end
 
-      def num_errors
-        @num_errors_metrics.get
-      end
-
-      def emit_count
-        @emit_count_metrics.get
-      end
-
-      def emit_size
-        @emit_size_metrics.get
-      end
-
-      def emit_records
-        @emit_records_metrics.get
-      end
-
       def initialize
         super
         @counter_mutex = Mutex.new

data/lib/fluent/plugin/base.rb

@@ -84,7 +84,7 @@ module Fluent
           yield
         end
         # Update access time to prevent tmpwatch from deleting a lock file.
-        FileUtils.touch(lock_path);
+        FileUtils.touch(lock_path)
       end
 
       def string_safe_encoding(str)
@@ -206,7 +206,7 @@ module Fluent
       end
 
       def reloadable_plugin?
-        # Engine can't capture all class variables. so it's forbbiden to use class variables in each plugins if enabling reload.
+        # Engine can't capture all class variables. so it's forbidden to use class variables in each plugins if enabling reload.
         self.class.class_variables.empty?
       end
     end

data/lib/fluent/plugin/buf_file.rb

@@ -191,7 +191,7 @@ module Fluent
         queue.sort_by!{ |chunk| chunk.modified_at }
 
         # If one of the files is corrupted, other files may also be corrupted and be undetected.
-        # The time priods of each chunk are helpful to check the data.
+        # The time periods of each chunk are helpful to check the data.
         if exist_broken_file
           log.info "Since a broken chunk file was found, it is possible that other files remaining at the time of resuming were also broken. Here is the list of the files."
           (stage.values + queue).each { |chunk|
@@ -229,6 +229,20 @@ module Fluent
         File.unlink(path, path + '.meta') rescue nil
       end
 
+      def evacuate_chunk(chunk)
+        unless chunk.is_a?(Fluent::Plugin::Buffer::FileChunk)
+          raise ArgumentError, "The chunk must be FileChunk, but it was #{chunk.class}."
+        end
+
+        backup_dir = File.join(backup_base_dir, 'buffer', safe_owner_id)
+        FileUtils.mkdir_p(backup_dir, mode: system_config.dir_permission || Fluent::DEFAULT_DIR_PERMISSION) unless Dir.exist?(backup_dir)
+
+        FileUtils.copy([chunk.path, chunk.meta_path], backup_dir)
+        log.warn "chunk files are evacuated to #{backup_dir}.", chunk_id: dump_unique_id_hex(chunk.unique_id)
+      rescue => e
+        log.error "unexpected error while evacuating chunk files.", error: e
+      end
+
       private
 
       def escaped_patterns(patterns)

data/lib/fluent/plugin/buf_file_single.rb

@@ -202,7 +202,7 @@ module Fluent
         queue.sort_by!(&:modified_at)
 
         # If one of the files is corrupted, other files may also be corrupted and be undetected.
-        # The time priods of each chunk are helpful to check the data.
+        # The time periods of each chunk are helpful to check the data.
         if exist_broken_file
           log.info "Since a broken chunk file was found, it is possible that other files remaining at the time of resuming were also broken. Here is the list of the files."
           (stage.values + queue).each { |chunk|
@@ -241,6 +241,20 @@ module Fluent
         File.unlink(path) rescue nil
       end
 
+      def evacuate_chunk(chunk)
+        unless chunk.is_a?(Fluent::Plugin::Buffer::FileSingleChunk)
+          raise ArgumentError, "The chunk must be FileSingleChunk, but it was #{chunk.class}."
+        end
+
+        backup_dir = File.join(backup_base_dir, 'buffer', safe_owner_id)
+        FileUtils.mkdir_p(backup_dir, mode: system_config.dir_permission || Fluent::DEFAULT_DIR_PERMISSION) unless Dir.exist?(backup_dir)
+
+        FileUtils.copy(chunk.path, backup_dir)
+        log.warn "chunk files are evacuated to #{backup_dir}.", chunk_id: dump_unique_id_hex(chunk.unique_id)
+      rescue => e
+        log.error "unexpected error while evacuating chunk files.", error: e
+      end
+
       private
 
       def escaped_patterns(patterns)