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

Fix in_monitor_agent's buffer_total_queued_size #1990

Merged
merged 2 commits into from
May 21, 2018
Merged

Fix in_monitor_agent's buffer_total_queued_size #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aa1726
Fix in_monitor_agent's buffer_total_queued_size, because now that val…
May 18, 2018
dc2937c
Update test for fix buffer_total_queued_size.
May 19, 2018
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
2 changes: 1 addition & 1 deletion lib/fluent/plugin/in_monitor_agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def shutdown
MONITOR_INFO = {
'output_plugin' => ->(){ is_a?(::Fluent::Plugin::Output) },
'buffer_queue_length' => ->(){ throw(:skip) unless instance_variable_defined?(:@buffer) && [email protected]? && @buffer.is_a?(::Fluent::Plugin::Buffer); @buffer.queue.size },
'buffer_total_queued_size' => ->(){ throw(:skip) unless instance_variable_defined?(:@buffer) && [email protected]? && @buffer.is_a?(::Fluent::Plugin::Buffer); @buffer.stage_size },
'buffer_total_queued_size' => ->(){ throw(:skip) unless instance_variable_defined?(:@buffer) && [email protected]? && @buffer.is_a?(::Fluent::Plugin::Buffer); @buffer.stage_size + @buffer.queue_size },
'retry_count' => ->(){ instance_variable_defined?(:@num_errors) ? @num_errors : nil },
}

Expand Down
2 changes: 1 addition & 1 deletion test/plugin/test_in_monitor_agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ def write(chunk)
d.instance.start
expected_test_out_fail_write_response = {
"buffer_queue_length" => 1,
"buffer_total_queued_size" => 0,
"buffer_total_queued_size" => 40,
"output_plugin" => true,
"plugin_category" => "output",
"plugin_id" => "test_out_fail_write",
Expand Down