Seperate variables for alert and finding scheduled rollovers (#705) (#…

…711) Signed-off-by: Ashish Agrawal <[email protected]> Signed-off-by: Ashish Agrawal <[email protected]> (cherry picked from commit 41265f8) Co-authored-by: Ashish Agrawal <[email protected]>
opensearch-project · Dec 21, 2022 · 33f449e · 33f449e
1 parent 3ba0929
commit 33f449e
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/alerts/AlertIndices.kt b/alerting/src/main/kotlin/org/opensearch/alerting/alerts/AlertIndices.kt
@@ -162,17 +162,19 @@ class AlertIndices(
 
     private var alertIndexInitialized: Boolean = false
 
-    private var scheduledRollover: Cancellable? = null
+    private var scheduledAlertRollover: Cancellable? = null
+
+    private var scheduledFindingRollover: Cancellable? = null
 
     fun onMaster() {
         try {
             // try to rollover immediately as we might be restarting the cluster
             rolloverAlertHistoryIndex()
             rolloverFindingHistoryIndex()
             // schedule the next rollover for approx MAX_AGE later
-            scheduledRollover = threadPool
+            scheduledAlertRollover = threadPool
                 .scheduleWithFixedDelay({ rolloverAndDeleteAlertHistoryIndices() }, alertHistoryRolloverPeriod, executorName())
-            scheduledRollover = threadPool
+            scheduledFindingRollover = threadPool
                 .scheduleWithFixedDelay({ rolloverAndDeleteFindingHistoryIndices() }, findingHistoryRolloverPeriod, executorName())
         } catch (e: Exception) {
             // This should be run on cluster startup
@@ -185,7 +187,8 @@ class AlertIndices(
     }
 
     fun offMaster() {
-        scheduledRollover?.cancel()
+        scheduledAlertRollover?.cancel()
+        scheduledFindingRollover?.cancel()
     }
 
     private fun executorName(): String {
@@ -213,16 +216,16 @@ class AlertIndices(
 
     private fun rescheduleAlertRollover() {
         if (clusterService.state().nodes.isLocalNodeElectedMaster) {
-            scheduledRollover?.cancel()
-            scheduledRollover = threadPool
+            scheduledAlertRollover?.cancel()
+            scheduledAlertRollover = threadPool
                 .scheduleWithFixedDelay({ rolloverAndDeleteAlertHistoryIndices() }, alertHistoryRolloverPeriod, executorName())
         }
     }
 
     private fun rescheduleFindingRollover() {
         if (clusterService.state().nodes.isLocalNodeElectedMaster) {
-            scheduledRollover?.cancel()
-            scheduledRollover = threadPool
+            scheduledFindingRollover?.cancel()
+            scheduledFindingRollover = threadPool
                 .scheduleWithFixedDelay({ rolloverAndDeleteFindingHistoryIndices() }, findingHistoryRolloverPeriod, executorName())
         }
     }