Skip to content

Commit 59d9f26

Browse files
nuclearpidgeonedsiper
authored andcommitted
input: update mem buf limit logging to include size info
Signed-off-by: Stewart Webb <[email protected]>
1 parent 2704fe8 commit 59d9f26

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

src/flb_input_chunk.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,8 +1338,10 @@ size_t flb_input_chunk_set_limits(struct flb_input_instance *in)
13381338
in->mem_buf_status = FLB_INPUT_RUNNING;
13391339
if (in->p->cb_resume) {
13401340
flb_input_resume(in);
1341-
flb_info("[input] %s resume (mem buf overlimit)",
1342-
flb_input_name(in));
1341+
flb_info("[input] %s resume (mem buf overlimit - buf size %zuB now below limit %zuB)",
1342+
flb_input_name(in),
1343+
in->mem_chunks_size,
1344+
in->mem_buf_limit);
13431345
}
13441346
}
13451347
if (flb_input_chunk_is_storage_overlimit(in) == FLB_FALSE &&
@@ -1363,7 +1365,7 @@ size_t flb_input_chunk_set_limits(struct flb_input_instance *in)
13631365
* If the number of bytes in use by the chunks are over the imposed limit
13641366
* by configuration, pause the instance.
13651367
*/
1366-
static inline int flb_input_chunk_protect(struct flb_input_instance *i)
1368+
static inline int flb_input_chunk_protect(struct flb_input_instance *i, size_t just_written_size)
13671369
{
13681370
struct flb_storage_input *storage = i->storage;
13691371

@@ -1395,8 +1397,12 @@ static inline int flb_input_chunk_protect(struct flb_input_instance *i)
13951397
* The plugin is using 'memory' buffering only and already reached
13961398
* it limit, just pause the ingestion.
13971399
*/
1398-
flb_warn("[input] %s paused (mem buf overlimit)",
1399-
flb_input_name(i));
1400+
flb_warn("[input] %s paused (mem buf overlimit - event of size %zuB exceeded limit %zu to %zuB)",
1401+
flb_input_name(i),
1402+
just_written_size,
1403+
i->mem_buf_limit,
1404+
i->mem_chunks_size
1405+
);
14001406
flb_input_pause(i);
14011407
i->mem_buf_status = FLB_INPUT_PAUSED;
14021408
return FLB_TRUE;
@@ -1832,7 +1838,7 @@ static int input_chunk_append_raw(struct flb_input_instance *in,
18321838
}
18331839
#endif /* FLB_HAVE_CHUNK_TRACE */
18341840

1835-
flb_input_chunk_protect(in);
1841+
flb_input_chunk_protect(in, final_data_size);
18361842
return 0;
18371843
}
18381844

0 commit comments

Comments
 (0)