unwrap remote transport exception

Signed-off-by: Surya Sashank Nistala <[email protected]>
eirsep · Feb 24, 2024 · 8de39be · 8de39be
1 parent ced398d
commit 8de39be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/DocumentLevelMonitorRunner.kt b/alerting/src/main/kotlin/org/opensearch/alerting/DocumentLevelMonitorRunner.kt
@@ -324,8 +324,11 @@ object DocumentLevelMonitorRunner : MonitorRunner() {
                                 }
 
                                 override fun onFailure(e: Exception) {
-                                    logger.info("Fan out failed")
-                                    cont.resumeWithException(e)
+                                    logger.info("Fan out failed", e)
+                                    if (e.cause is Exception) // unwrap remote transport exception
+                                        cont.resumeWithException(e.cause as Exception)
+                                    else
+                                        cont.resumeWithException(e)
                                 }
                             },
                             nodeMap.size

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt
@@ -645,7 +645,7 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
             .get()
         Assert.assertTrue(getAlertsResponse != null)
         Assert.assertTrue(getAlertsResponse.alerts.size == 1)
-        Assert.assertTrue(getAlertsResponse.alerts[0].errorMessage == "IndexClosedException[closed]")
+        Assert.assertTrue(getAlertsResponse.alerts[0].errorMessage!!.contains("IndexClosedException[closed]"))
         // Reopen index
         client().admin().indices().open(OpenIndexRequest(index)).get()
         // Close queryIndex