Skip to content

Bug 1833226: Fix disk pressure for fluentd buffer chunks #510

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

Merged
merged 1 commit into from
May 13, 2020
Merged

Bug 1833226: Fix disk pressure for fluentd buffer chunks #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions pkg/generators/forwarding/fluentd/fluent_conf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ var _ = Describe("Generating fluentd config", func() {
<buffer>
@type file
path '/var/lib/fluentd/secureforward_receiver'
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '1024' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '1m' }"
flush_interval "#{ENV['FORWARD_FLUSH_INTERVAL'] || '5s'}"
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
Expand Down Expand Up @@ -916,7 +916,7 @@ var _ = Describe("Generating fluentd config", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down Expand Up @@ -959,7 +959,7 @@ var _ = Describe("Generating fluentd config", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down Expand Up @@ -1003,7 +1003,7 @@ var _ = Describe("Generating fluentd config", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down Expand Up @@ -1046,7 +1046,7 @@ var _ = Describe("Generating fluentd config", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down Expand Up @@ -1090,7 +1090,7 @@ var _ = Describe("Generating fluentd config", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down Expand Up @@ -1133,7 +1133,7 @@ var _ = Describe("Generating fluentd config", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down Expand Up @@ -1177,7 +1177,7 @@ var _ = Describe("Generating fluentd config", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down Expand Up @@ -1220,7 +1220,7 @@ var _ = Describe("Generating fluentd config", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down
8 changes: 4 additions & 4 deletions pkg/generators/forwarding/fluentd/output_conf_es_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ var _ = Describe("Generating fluentd config blocks", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down Expand Up @@ -143,7 +143,7 @@ var _ = Describe("Generating fluentd config blocks", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down Expand Up @@ -200,7 +200,7 @@ var _ = Describe("Generating fluentd config blocks", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down Expand Up @@ -239,7 +239,7 @@ var _ = Describe("Generating fluentd config blocks", func() {
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down
4 changes: 2 additions & 2 deletions pkg/generators/forwarding/fluentd/output_conf_forward_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var _ = Describe("Generating fluentd secure forward output store config blocks",
<buffer>
@type file
path '/var/lib/fluentd/secureforward_receiver'
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '1024' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '1m' }"
flush_interval "#{ENV['FORWARD_FLUSH_INTERVAL'] || '5s'}"
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
Expand Down Expand Up @@ -102,7 +102,7 @@ var _ = Describe("Generating fluentd secure forward output store config blocks",
<buffer>
@type file
path '/var/lib/fluentd/secureforward_receiver'
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '1024' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '1m' }"
flush_interval "#{ENV['FORWARD_FLUSH_INTERVAL'] || '5s'}"
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
Expand Down
4 changes: 2 additions & 2 deletions pkg/generators/forwarding/fluentd/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ const forwardTemplate = `{{- define "forward" }}
<buffer>
@type file
path '{{.BufferPath}}'
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '1024' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '1m' }"
flush_interval "#{ENV['FORWARD_FLUSH_INTERVAL'] || '5s'}"
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
Expand Down Expand Up @@ -570,7 +570,7 @@ const storeElasticsearchTemplate = `{{- define "storeElasticsearch" }}
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
overflow_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"
</buffer>
Expand Down
2 changes: 1 addition & 1 deletion test/files/secure-forward.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<buffer>
@type file
path '/var/lib/fluentd/secureforwardlegacy'
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '1024' }"
queue_limit_length "#{ENV['BUFFER_QUEUE_LIMIT'] || '1024' }"
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '1m' }"
flush_interval "#{ENV['FORWARD_FLUSH_INTERVAL'] || '5s'}"
flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
Expand Down