Adding exception message in failed status error message

Signed-off-by: Nishant Goel <[email protected]>
opensearch-project · Jun 21, 2023 · 40b9eee · 40b9eee
1 parent 3c5187c
commit 40b9eee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/...rg/opensearch/replication/action/index/TransportReplicateIndexClusterManagerNodeAction.kt b/...rg/opensearch/replication/action/index/TransportReplicateIndexClusterManagerNodeAction.kt
@@ -128,7 +128,7 @@ class TransportReplicateIndexClusterManagerNodeAction @Inject constructor(transp
                     val replicationState = (t.state as IndexReplicationState?)?.state
                     replicationState == ReplicationState.FOLLOWING ||
                             (!replicateIndexReq.waitForRestore && replicationState == ReplicationState.RESTORING) ||
-                            (!replicateIndexReq. waitForRestore && replicationState == ReplicationState. FAILED)
+                            (!replicateIndexReq.waitForRestore && replicationState == ReplicationState.FAILED)
                 }
 
                 listener.onResponse(AcknowledgedResponse(true))

diff --git a/src/main/kotlin/org/opensearch/replication/task/index/IndexReplicationTask.kt b/src/main/kotlin/org/opensearch/replication/task/index/IndexReplicationTask.kt
@@ -828,12 +828,8 @@ open class IndexReplicationTask(id: Long, type: String, action: String, descript
             }
         } catch(e: Exception) {
             val err = "Unable to initiate restore call for $followerIndexName from $leaderAlias:${leaderIndex.name}"
-            val aliasErrMsg = "cannot rename index [${leaderIndex.name}] into [$followerIndexName] because of conflict with an alias with the same name"
             log.error(err, e)
-            if (e.message!!.contains(aliasErrMsg)) {
-                return FailedState (Collections.emptyMap(), aliasErrMsg)
-            }
-            return FailedState(Collections.emptyMap(), err)
+            return FailedState(Collections.emptyMap(), e.message!!)
         }
         cso.waitForNextChange("remote restore start") { inProgressRestore(it) != null }
         return RestoreState