fix post delete method and refactor alert mover to add class level lo…

…gger Signed-off-by: Surya Sashank Nistala <[email protected]>
opensearch-project · Jul 11, 2023 · 54b9469 · 54b9469
1 parent b2af473
commit 54b9469
Show file tree

Hide file tree

Showing 3 changed files with 206 additions and 186 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/MonitorRunnerService.kt b/alerting/src/main/kotlin/org/opensearch/alerting/MonitorRunnerService.kt
@@ -15,7 +15,7 @@ import org.opensearch.action.ActionListener
 import org.opensearch.action.bulk.BackoffPolicy
 import org.opensearch.action.support.master.AcknowledgedResponse
 import org.opensearch.alerting.alerts.AlertIndices
-import org.opensearch.alerting.alerts.moveAlerts
+import org.opensearch.alerting.alerts.AlertMover.Companion.moveAlerts
 import org.opensearch.alerting.core.JobRunner
 import org.opensearch.alerting.core.ScheduledJobIndices
 import org.opensearch.alerting.model.MonitorRunResult
@@ -232,6 +232,15 @@ object MonitorRunnerService : JobRunner, CoroutineScope, AbstractLifecycleCompon
                 monitorCtx.moveAlertsRetryPolicy!!.retry(logger) {
                     moveAlerts(monitorCtx.client!!, jobId, null, monitorCtx)
                 }
+            } catch (e: Exception) {
+                logger.error("Failed to move active alerts for workflow [$jobId]. Could be a monitor", e)
+            }
+            try {
+                monitorCtx.moveAlertsRetryPolicy!!.retry(logger) {
+                    if (monitorCtx.alertIndices!!.isAlertInitialized()) {
+                        moveAlerts(monitorCtx.client!!, jobId, null)
+                    }
+                }
             } catch (e: Exception) {
                 logger.error("Failed to move active alerts for monitor [$jobId].", e)
             }