config: ml: Handle SI prefixes on the buffer limit of multiline

Signed-off-by: Hiroshi Hatake <[email protected]>

Author: cosmo0920

include/fluent-bit/flb_config.h

@@ -145,7 +145,7 @@ struct flb_config {
 
     /* Multiline core parser definitions */
     struct mk_list multiline_parsers;
-    size_t multiline_buffer_limit; /* limit for multiline concatenated data */
+    char *multiline_buffer_limit; /* limit for multiline concatenated data */
 
     /* Outputs instances */
     struct mk_list outputs;             /* list of output plugins   */

include/fluent-bit/multiline/flb_ml.h

@@ -53,7 +53,8 @@
 #define FLB_ML_BUF_SIZE         1024*4
 
 /* Default limit for concatenated multiline messages: 2MB */
-#define FLB_ML_BUFFER_LIMIT_DEFAULT  (1024 * 1024 * 2)
+#define FLB_ML_BUFFER_LIMIT_DEFAULT_STR "2MB"
+#define FLB_ML_BUFFER_LIMIT_DEFAULT     (1024 * 1024 * 2)
 
 /* Return codes */
 #define FLB_MULTILINE_OK         0

src/flb_config.c

@@ -170,7 +170,7 @@ struct flb_service_config service_configs[] = {
      offsetof(struct flb_config, coro_stack_size)},
 
     {FLB_CONF_STR_MULTILINE_BUFFER_LIMIT,
-     FLB_CONF_TYPE_INT,
+     FLB_CONF_TYPE_STR,
      offsetof(struct flb_config, multiline_buffer_limit)},
 
     /* Scheduler */
@@ -365,7 +365,7 @@ struct flb_config *flb_config_init()
      * on we use flb_config_exit to cleanup the config, which requires
      * the config->multiline_parsers list to be initialized. */
     mk_list_init(&config->multiline_parsers);
-    config->multiline_buffer_limit = FLB_ML_BUFFER_LIMIT_DEFAULT;
+    config->multiline_buffer_limit = FLB_ML_BUFFER_LIMIT_DEFAULT_STR;
 
     /* Task map */
     ret = flb_config_task_map_resize(config, FLB_CONFIG_DEFAULT_TASK_MAP_SIZE);

src/multiline/flb_ml.c

@@ -24,6 +24,7 @@
 #include <fluent-bit/flb_time.h>
 #include <fluent-bit/flb_pack.h>
 #include <fluent-bit/flb_scheduler.h>
+#include <fluent-bit/flb_utils.h>
 #include <fluent-bit/multiline/flb_ml.h>
 #include <fluent-bit/multiline/flb_ml_rule.h>
 #include <fluent-bit/multiline/flb_ml_group.h>
@@ -867,6 +868,7 @@ int flb_ml_append_event(struct flb_ml *ml, uint64_t stream_id,
 struct flb_ml *flb_ml_create(struct flb_config *ctx, char *name)
 {
     int            result;
+    size_t         limit = 0;
     struct flb_ml *ml;
 
     ml = flb_calloc(1, sizeof(struct flb_ml));
@@ -881,7 +883,13 @@ struct flb_ml *flb_ml_create(struct flb_config *ctx, char *name)
     }
 
     ml->config = ctx;
-    ml->buffer_limit = ml->config->multiline_buffer_limit;
+    limit = flb_utils_size_to_bytes(ml->config->multiline_buffer_limit);
+    if (limit > 0) {
+        ml->buffer_limit = (size_t)limit;
+    }
+    else {
+        ml->buffer_limit = FLB_ML_BUFFER_LIMIT_DEFAULT;
+    }
     ml->last_flush = time_ms_now();
     mk_list_init(&ml->groups);