Skip to content

flb_input: Config parsing order fixed for storage.pause_on_chunks_overlimit #8720

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
edsiper merged 1 commit into from
Jul 12, 2024
Merged

flb_input: Config parsing order fixed for storage.pause_on_chunks_overlimit #8720

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
20 changes: 13 additions & 7 deletions src/flb_input.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,15 @@ int flb_input_set_property(struct flb_input_instance *ins,
flb_sds_destroy(tmp);
return -1;
}

if (ins->storage_type != FLB_STORAGE_FS &&
ins->storage_pause_on_chunks_overlimit == FLB_TRUE) {
flb_debug("[input] storage.pause_on_chunks_overlimit will be "
"reset because storage.type is not filesystem");
ins->storage_pause_on_chunks_overlimit = FLB_FALSE;
}
flb_sds_destroy(tmp);

}
else if (prop_key_check("threaded", k, len) == 0 && tmp) {
enabled = flb_utils_bool(tmp);
Expand All @@ -604,14 +612,12 @@ int flb_input_set_property(struct flb_input_instance *ins,
ins->is_threaded = enabled;
}
else if (prop_key_check("storage.pause_on_chunks_overlimit", k, len) == 0 && tmp) {
if (ins->storage_type == FLB_STORAGE_FS) {
ret = flb_utils_bool(tmp);
flb_sds_destroy(tmp);
if (ret == -1) {
return -1;
}
ins->storage_pause_on_chunks_overlimit = ret;
ret = flb_utils_bool(tmp);
flb_sds_destroy(tmp);
if (ret == -1) {
return -1;
}
ins->storage_pause_on_chunks_overlimit = ret;
}
else {
/*
Expand Down