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.

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_exec: fix a file descriptor leaks #3634

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions lib/fluent/plugin/in_exec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ def run(io)
else
@parser.parse(io.read, &method(:on_record))
end
io.close if io.eof?
Copy link
Member

@ashie ashie Feb 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally speaking, resources should be closed by the one who opened it.
I'm not sure but closing it here might not be appropriate.

end

def on_record(time, record)
Expand Down
10 changes: 10 additions & 0 deletions test/plugin/test_in_exec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,14 @@ def create_driver(conf)
assert_match(/LoadError/, event[2]['message'])
end
end

test 'ensure not leaking file descriptor' do
omit "/proc/PID is not available on Windows" if Fluent.windows?
d = create_driver JSON_CONFIG_COMPAT
before_fd_count = Dir.glob("/proc/#{$$}/fd/*").length
d.run(expect_records: 10, timeout: 10)
after_fd_count = Dir.glob("/proc/#{$$}/fd/*").length

assert{ before_fd_count == after_fd_count }
end
end