Allow 0 as Retry_Limit to disable retrying (fluent#3219)

* output: define unlimited/none retry configurtion constant Signed-off-by: Takahiro Yamashita <nokute78@gmail.com> * engine: support no retry configuration(fluent#3190) Signed-off-by: Takahiro Yamashita <nokute78@gmail.com> * sosreport: use FLB_OUT_RETRY_UNLIMITED define Signed-off-by: Takahiro Yamashita <nokute78@gmail.com> * output: set default value when invalid retry_limit is set Signed-off-by: Takahiro Yamashita <nokute78@gmail.com> * output: support no_retries/no_limits as retry_limits value Signed-off-by: Takahiro Yamashita <nokute78@gmail.com>
DrewZhang13 · May 3, 2021 · 7c46b02 · 7c46b02
1 parent 8b00df6
commit 7c46b02
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/include/fluent-bit/flb_output.h b/include/fluent-bit/flb_output.h
@@ -184,6 +184,10 @@ struct flb_output_plugin {
     struct mk_list _head;
 };
 
+// constants for retry_limit
+#define FLB_OUT_RETRY_UNLIMITED -1
+#define FLB_OUT_RETRY_NONE       0
+
 /*
  * Each initialized plugin must have an instance, same plugin may be
  * loaded more than one time.

diff --git a/src/flb_engine.c b/src/flb_engine.c
@@ -215,6 +215,17 @@ static inline int handle_output_event(flb_pipefd_t fd, struct flb_config *config
         flb_task_users_dec(task, FLB_TRUE);
     }
     else if (ret == FLB_RETRY) {
+        if (ins->retry_limit == FLB_OUT_RETRY_NONE) {
+            flb_info("[engine] chunk '%s' is not retried (no retry config): "
+                     "task_id=%i, input=%s > output=%s (out_id=%i)",
+                     flb_input_chunk_get_name(task->ic),
+                     task_id,
+                     flb_input_name(task->i_ins),
+                     flb_output_name(ins), out_id);
+            flb_task_users_dec(task, FLB_TRUE);
+            return 0;
+        }
+
         /* Create a Task-Retry */
         retry = flb_task_retry_create(task, ins);
         if (!retry) {

diff --git a/src/flb_output.c b/src/flb_output.c
@@ -598,18 +598,27 @@ int flb_output_set_property(struct flb_output_instance *ins,
     }
     else if (prop_key_check("retry_limit", k, len) == 0) {
         if (tmp) {
-            if (strcasecmp(tmp, "false") == 0 ||
+            if (strcasecmp(tmp, "no_limits") == 0 ||
+                strcasecmp(tmp, "false") == 0 ||
                 strcasecmp(tmp, "off") == 0) {
                 /* No limits for retries */
-                ins->retry_limit = -1;
+                ins->retry_limit = FLB_OUT_RETRY_UNLIMITED;
+            }
+            else if (strcasecmp(tmp, "no_retries") == 0) {
+                ins->retry_limit = FLB_OUT_RETRY_NONE;
             }
             else {
                 ins->retry_limit = atoi(tmp);
+                if (ins->retry_limit <= 0) {
+                    flb_warn("[config] invalid retry_limit. set default.");
+                    /* set default when input is invalid number */
+                    ins->retry_limit = 1;
+                }
             }
             flb_sds_destroy(tmp);
         }
         else {
-            ins->retry_limit = 0;
+            ins->retry_limit = 1;
         }
     }
     else if (strncasecmp("net.", k, 4) == 0 && tmp) {

diff --git a/src/flb_sosreport.c b/src/flb_sosreport.c
@@ -308,7 +308,7 @@ int flb_sosreport(struct flb_config *config)
                    ins_out->tls_key_passwd ? "*****" : "(not set)");
         }
 #endif
-        if (ins_out->retry_limit == -1) {
+        if (ins_out->retry_limit == FLB_OUT_RETRY_UNLIMITED) {
             printf("    Retry Limit\t\tno limit\n");
         }
         else {