input_chunk: fix storage limit eviction with 32 or more outputs #12235
+184
−12
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1123,6 +1123,173 @@ void flb_test_input_chunk_prefers_deletable_files_on_limit(void) | |
| flb_free(root_path); | ||
| } | ||
|
|
||
| void flb_test_input_chunk_limit_with_many_outputs(void) | ||
|
There was a problem hiding this comment.
This commit combines the core AGENTS.md reference: AGENTS.md:L169-L172 Useful? React with 👍 / 👎. |
||
| { | ||
| int i; | ||
| int records; | ||
| struct flb_input_instance *i_ins; | ||
| struct flb_output_instance *o_low; | ||
| struct flb_output_instance *o_filler; | ||
| struct flb_output_instance *o_high; | ||
| struct mk_list *head; | ||
| struct mk_list *tmp; | ||
| struct flb_input_chunk *ic; | ||
| struct flb_task *task; | ||
| struct flb_config *cfg; | ||
| struct cio_ctx *cio; | ||
| struct mk_event_loop *evl; | ||
| struct cio_options opts = {0}; | ||
| char *root_path; | ||
| char temp_path[128]; | ||
| char buf[2048]; | ||
| ssize_t chunk_real_size; | ||
| size_t first_chunk_size; | ||
|
|
||
| snprintf(temp_path, sizeof(temp_path) - 1, | ||
| "/input-chunk-many-outputs-%i/", getpid()); | ||
| temp_path[sizeof(temp_path) - 1] = '\0'; | ||
|
|
||
| root_path = flb_test_tmpdir_cat(temp_path); | ||
| TEST_CHECK(root_path != NULL); | ||
| if (!root_path) { | ||
| return; | ||
| } | ||
|
|
||
| memset(buf, 0x5A, sizeof(buf)); | ||
|
|
||
| flb_init_env(); | ||
| cfg = flb_config_init(); | ||
| evl = mk_event_loop_create(256); | ||
|
|
||
| TEST_CHECK(evl != NULL); | ||
| if (!evl) { | ||
| flb_config_exit(cfg); | ||
| flb_free(root_path); | ||
| return; | ||
| } | ||
|
|
||
| cfg->evl = evl; | ||
| flb_log_create(cfg, FLB_LOG_STDERR, FLB_LOG_DEBUG, NULL); | ||
|
|
||
| i_ins = flb_input_new(cfg, "dummy", NULL, FLB_TRUE); | ||
| TEST_CHECK(i_ins != NULL); | ||
| if (!i_ins) { | ||
| flb_config_exit(cfg); | ||
| flb_free(root_path); | ||
| return; | ||
| } | ||
| i_ins->storage_type = CIO_STORE_FS; | ||
|
|
||
| cio_options_init(&opts); | ||
| opts.root_path = root_path; | ||
| opts.log_cb = log_cb; | ||
| opts.log_level = CIO_LOG_DEBUG; | ||
| opts.flags = CIO_OPEN; | ||
|
|
||
| cio = cio_create(&opts); | ||
| TEST_CHECK(cio != NULL); | ||
| if (!cio) { | ||
| flb_input_exit_all(cfg); | ||
| flb_output_exit(cfg); | ||
| flb_config_exit(cfg); | ||
| flb_free(root_path); | ||
| return; | ||
| } | ||
|
|
||
| flb_storage_input_create(cio, i_ins); | ||
| flb_input_init_all(cfg); | ||
|
|
||
| o_low = flb_output_new(cfg, "http", NULL, FLB_TRUE); | ||
| TEST_CHECK(o_low != NULL); | ||
| if (!o_low) { | ||
| cio_destroy(cio); | ||
| flb_input_exit_all(cfg); | ||
| flb_output_exit(cfg); | ||
| flb_config_exit(cfg); | ||
| flb_free(root_path); | ||
| return; | ||
| } | ||
| flb_output_set_property(o_low, "match", "many.*"); | ||
| flb_output_set_property(o_low, "storage.total_limit_size", "10M"); | ||
|
|
||
| for (i = 0; i < 31; i++) { | ||
| o_filler = flb_output_new(cfg, "http", NULL, FLB_TRUE); | ||
| TEST_CHECK(o_filler != NULL); | ||
| if (!o_filler) { | ||
| cio_destroy(cio); | ||
| flb_input_exit_all(cfg); | ||
| flb_output_exit(cfg); | ||
| flb_config_exit(cfg); | ||
| flb_free(root_path); | ||
| return; | ||
| } | ||
| flb_output_set_property(o_filler, "match", "filler.*"); | ||
| } | ||
|
|
||
| o_high = flb_output_new(cfg, "http", NULL, FLB_TRUE); | ||
| TEST_CHECK(o_high != NULL); | ||
| if (!o_high) { | ||
| cio_destroy(cio); | ||
| flb_input_exit_all(cfg); | ||
| flb_output_exit(cfg); | ||
| flb_config_exit(cfg); | ||
| flb_free(root_path); | ||
| return; | ||
| } | ||
| TEST_CHECK(o_low->id == 0); | ||
| TEST_CHECK(o_high->id == 32); | ||
| flb_output_set_property(o_high, "match", "many.*"); | ||
| flb_output_set_property(o_high, "storage.total_limit_size", "10M"); | ||
|
|
||
| TEST_CHECK(flb_routes_mask_set_size(mk_list_size(&cfg->outputs), | ||
| cfg->router) == 0); | ||
| TEST_CHECK_(flb_router_io_set(cfg) != -1, "unable to router"); | ||
|
|
||
| records = flb_mp_count(buf, sizeof(buf)); | ||
|
|
||
| TEST_CHECK(flb_input_chunk_append_raw(i_ins, FLB_INPUT_LOGS, | ||
| records, "many.one", 8, | ||
| buf, sizeof(buf)) == 0); | ||
| ic = mk_list_entry_last(&i_ins->chunks, struct flb_input_chunk, _head); | ||
| chunk_real_size = flb_input_chunk_get_real_size(ic); | ||
| TEST_CHECK(chunk_real_size > 0); | ||
| if (chunk_real_size <= 0) { | ||
| goto cleanup; | ||
| } | ||
| first_chunk_size = (size_t) chunk_real_size; | ||
| o_high->total_limit_size = first_chunk_size + (first_chunk_size / 2); | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
| TEST_CHECK(flb_input_chunk_append_raw(i_ins, FLB_INPUT_LOGS, | ||
| records, "many.two", 8, | ||
| buf, sizeof(buf)) == 0); | ||
|
|
||
| TEST_CHECK(mk_list_size(&i_ins->chunks) == 2); | ||
| ic = mk_list_entry_first(&i_ins->chunks, struct flb_input_chunk, _head); | ||
| TEST_CHECK(flb_routes_mask_get_bit(ic->routes_mask, | ||
| o_low->id, cfg->router) == 1); | ||
| TEST_CHECK(flb_routes_mask_get_bit(ic->routes_mask, | ||
| o_high->id, cfg->router) == 0); | ||
| TEST_CHECK(o_high->fs_chunks_size <= o_high->total_limit_size); | ||
|
|
||
| cleanup: | ||
| mk_list_foreach_safe(head, tmp, &i_ins->tasks) { | ||
| task = mk_list_entry(head, struct flb_task, _head); | ||
| flb_task_destroy(task, FLB_TRUE); | ||
| } | ||
|
|
||
| mk_list_foreach_safe(head, tmp, &i_ins->chunks) { | ||
| ic = mk_list_entry(head, struct flb_input_chunk, _head); | ||
| flb_input_chunk_destroy(ic, FLB_TRUE); | ||
| } | ||
|
|
||
| cio_destroy(cio); | ||
| flb_router_exit(cfg); | ||
| flb_input_exit_all(cfg); | ||
| flb_output_exit(cfg); | ||
| flb_config_exit(cfg); | ||
| flb_free(root_path); | ||
| } | ||
|
|
||
|
|
||
| /* Test list */ | ||
| TEST_LIST = { | ||
|
|
@@ -1136,5 +1303,7 @@ TEST_LIST = { | |
| flb_test_input_chunk_grouped_release_space_drop_counters}, | ||
| {"input_chunk_prefers_deletable_files_on_limit", | ||
| flb_test_input_chunk_prefers_deletable_files_on_limit}, | ||
| {"input_chunk_limit_with_many_outputs", | ||
| flb_test_input_chunk_limit_with_many_outputs}, | ||
| {NULL, NULL} | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reviewed commit message has no
Signed-off-by:trailer, so it does not satisfy the repository's mandatory DCO signing requirement and may be rejected by contribution checks; recreate the commit with an appropriate DCO sign-off.AGENTS.md reference: AGENTS.md:L140-L140
Useful? React with 👍 / 👎.