engine: force flush on shutdown to create tasks for pending chunks

Signed-off-by: Wesley Pettit <wppttt@amazon.com>
PettitWesley · Jun 13, 2024 · 79445f7 · 79445f7
1 parent 362aa77
commit 79445f7
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/flb_engine.c b/src/flb_engine.c
@@ -564,6 +564,7 @@ int flb_engine_start(struct flb_config *config)
     struct flb_bucket_queue *evl_bktq;
     struct flb_sched *sched;
     struct flb_net_dns dns_ctx;
+    int exiting = FLB_FALSE;
 
     /* Initialize the networking layer */
     flb_net_lib_init();
@@ -840,22 +841,29 @@ int flb_engine_start(struct flb_config *config)
                             flb_task_running_print(config);
                         }
                         if ((mem_chunks + fs_chunks) > 0) {
-                            flb_info("[engine] Pending chunk count: memory=%d, filesystem=%d",
-                                     mem_chunks, fs_chunks);
+                            flb_info("[engine] Pending chunk count: memory=%d, filesystem=%d; grace_timer=%d",
+                                     mem_chunks, fs_chunks, config->grace_count);
                         }
+                        /* Create new tasks for pending chunks */
+                        flb_engine_flush(config, NULL);
                         if (config->grace_count < config->grace_input) {
-                            flb_engine_exit(config);
+                            if (exiting == FLB_FALSE) {
+                                flb_engine_exit(config);
+                                exiting = FLB_TRUE;
+                            }
                         } else {
-                            flb_engine_stop_ingestion(config);
+                            if (config->is_ingestion_active == FLB_TRUE) {
+                                flb_engine_stop_ingestion(config);
+                            }
                         }
                     }
                     else {
                         if (tasks > 0) {
                             flb_task_running_print(config);
                         }
                         if ((mem_chunks + fs_chunks) > 0) {
-                            flb_info("[engine] Pending chunk count: memory=%d, filesystem=%d",
-                                     mem_chunks, fs_chunks);
+                            flb_info("[engine] pending chunk count: memory=%d, filesystem=%d; grace_timer=%d",
+                                     mem_chunks, fs_chunks, config->grace_count);
                         }
                         flb_info("[engine] service has stopped (%i pending tasks)",
                                  tasks);