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

in_tail: Check detaching inode when follow_inodes #4191

Merged
merged 2 commits into from
Jun 30, 2023
Merged

in_tail: Check detaching inode when follow_inodes #4191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9b36c1
Check inode expectation to detach correct watcher when follow_inodes
garyzjq May 31, 2023
bcd9a1a
only add warning log only when detect detaching a wrong watcher
garyzjq Jun 28, 2023
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
4 changes: 4 additions & 0 deletions lib/fluent/plugin/in_tail.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,10 @@ def update_watcher(target_info, pe)
# so adding close_io argument to avoid this problem.
# At shutdown, IOHandler's io will be released automatically after detached the event loop
def detach_watcher(tw, ino, close_io = true)
if @follow_inodes && tw.ino != ino
ashie marked this conversation as resolved.
Show resolved Hide resolved
log.warn("detach_watcher could be detaching an unexpected tail_watcher with a different ino.",
path: tw.path, actual_ino_in_tw: tw.ino, expect_ino_to_close: ino)
end
tw.watchers.each do |watcher|
event_loop_detach(watcher)
end
Expand Down