Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Write buffer metadata into file ASAP #1628

Merged
merged 2 commits into from
Jul 21, 2017
Merged

Write buffer metadata into file ASAP #1628

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34ef000
Write metadata from head of file at first, then truncate the file to …
tagomoris Jul 13, 2017
ea86fc0
write the metadata into file as soon as possible after initializing i…
tagomoris Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/fluent/plugin/buffer/file_chunk.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,10 @@ def write_metadata(update: true)
c: @created_at.to_i,
m: (update ? Time.now : @modified_at).to_i,
})
bin = msgpack_packer.pack(data).to_s
@meta.seek(0, IO::SEEK_SET)
@meta.truncate(0)
@meta.write(msgpack_packer.pack(data))
@meta.write(bin)
@meta.truncate(bin.bytesize)
end

def file_rename(file, old_path, new_path, callback=nil)
Expand Down Expand Up @@ -284,6 +285,7 @@ def create_new_chunk(path, perm)
@meta.set_encoding(Encoding::ASCII_8BIT)
@meta.sync = true
@meta.binmode
write_metadata(update: false)
rescue => e
# This case is easier than enqueued!. Just removing pre-create buffer file
@chunk.close rescue nil
Expand Down