Skip to content

Commit

Permalink
Merge pull request #4027 from daipom/add-warning-for-restoring-buffer
Browse files Browse the repository at this point in the history
buffer: warning message for restoring buffer with flush_at_shutdown
  • Loading branch information
ashie authored Jan 27, 2023
2 parents bafaa28 + 0807567 commit 64509a1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
8 changes: 7 additions & 1 deletion lib/fluent/plugin/buf_file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,13 @@ def resume
Dir.glob(escaped_patterns(patterns)) do |path|
next unless File.file?(path)

log.debug { "restoring buffer file: path = #{path}" }
if owner.respond_to?(:buffer_config) && owner.buffer_config&.flush_at_shutdown
# When `flush_at_shutdown` is `true`, the remaining chunk files during resuming are possibly broken
# since there may be a power failure or similar failure.
log.warn { "restoring buffer file: path = #{path}" }
else
log.debug { "restoring buffer file: path = #{path}" }
end

m = new_metadata() # this metadata will be overwritten by resuming .meta file content
# so it should not added into @metadata_list for now
Expand Down
8 changes: 7 additions & 1 deletion lib/fluent/plugin/buf_file_single.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,13 @@ def resume
Dir.glob(escaped_patterns(patterns)) do |path|
next unless File.file?(path)

log.debug { "restoring buffer file: path = #{path}" }
if owner.respond_to?(:buffer_config) && owner.buffer_config&.flush_at_shutdown
# When `flush_at_shutdown` is `true`, the remaining chunk files during resuming are possibly broken
# since there may be a power failure or similar failure.
log.warn { "restoring buffer file: path = #{path}" }
else
log.debug { "restoring buffer file: path = #{path}" }
end

m = new_metadata() # this metadata will be updated in FileSingleChunk.new
mode = Fluent::Plugin::Buffer::FileSingleChunk.assume_chunk_state(path)
Expand Down

0 comments on commit 64509a1

Please sign in to comment.