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

out_s3: clarify comment about sending chunks #10100

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

out_s3: clarify comment about sending chunks #10100

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
4 changes: 2 additions & 2 deletions plugins/out_s3/s3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ static int cb_s3_init(struct flb_output_instance *ins,

/*
* S3 must ALWAYS use sync mode
* In the timer thread we do a mk_list_foreach_safe on the queue of uplaods and chunks
* In the timer thread we do a mk_list_foreach_safe on the queue of uploads and chunks
* Iterating over those lists is not concurrent safe. If a flush call ran at the same time
* And deleted an item from the list, this could cause a crash/corruption.
*/
Expand Down Expand Up @@ -1779,7 +1779,7 @@ static void cb_s3_upload(struct flb_config *config, void *data)
chunk = fsf->data;

if (now < (chunk->create_time + ctx->upload_timeout + ctx->retry_time)) {
continue; /* Only send chunks which have timed out */
continue; /* Only send chunks which haven't timed out */
}

/* Locked chunks are being processed, skip */
Expand Down
Loading