FlintStreamingJobCleanerTask Implementation (opensearch-project#2574)

Signed-off-by: Vamsi Manohar <[email protected]>
ykmr1224 · Mar 20, 2024 · 284a0be · 284a0be
1 parent 4dc83b7
commit 284a0be
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/spark/src/main/java/org/opensearch/sql/spark/cluster/ClusterManagerEventListener.java b/spark/src/main/java/org/opensearch/sql/spark/cluster/ClusterManagerEventListener.java
@@ -133,7 +133,18 @@ public void beforeStop() {
             }
           });
     }
-    initializeStreamingJobHouseKeeperCron();
+
+    if (flintStreamingJobHouseKeeperCron == null) {
+      initializeStreamingJobHouseKeeperCron();
+      clusterService.addLifecycleListener(
+          new LifecycleListener() {
+            @Override
+            public void beforeStop() {
+              cancel(flintStreamingJobHouseKeeperCron);
+              flintStreamingJobHouseKeeperCron = null;
+            }
+          });
+    }
   }
 
   private void initializeStreamingJobHouseKeeperCron() {