Handle respone for deletion of non-existing autofollow replication ru…

…le (#1371) (#1372) Signed-off-by: Sanjay Kumar <[email protected]> (cherry picked from commit d404742) Co-authored-by: Sanjay Kumar <[email protected]>
opensearch-project · Apr 25, 2024 · 619f10d · 619f10d
1 parent a501df9
commit 619f10d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/...g/opensearch/replication/action/autofollow/TransportAutoFollowClusterManagerNodeAction.kt b/...g/opensearch/replication/action/autofollow/TransportAutoFollowClusterManagerNodeAction.kt
@@ -123,6 +123,7 @@ class TransportAutoFollowClusterManagerNodeAction @Inject constructor(transportS
         } catch(e: ResourceNotFoundException) {
             // Log warn as the task is already removed
             log.warn("Task already stopped for '$clusterAlias:$patternName'", e)
+            throw OpenSearchException("Autofollow replication rule $clusterAlias:$patternName does not exist")
         } catch (e: Exception) {
            log.error("Failed to stop auto follow task for cluster '$clusterAlias:$patternName'", e)
             throw OpenSearchException(AUTOFOLLOW_EXCEPTION_GENERIC_STRING)

diff --git a/src/test/kotlin/org/opensearch/replication/integ/rest/UpdateAutoFollowPatternIT.kt b/src/test/kotlin/org/opensearch/replication/integ/rest/UpdateAutoFollowPatternIT.kt
@@ -295,6 +295,22 @@ class UpdateAutoFollowPatternIT: MultiClusterRestTestCase() {
             .hasMessageContaining(errorMsg)
     }
 
+    fun `test deletion of auto follow pattern`() {
+        val followerClient = getClientForCluster(FOLLOWER)
+        createConnectionBetweenClusters(FOLLOWER, LEADER, connectionAlias)
+        followerClient.updateAutoFollowPattern(connectionAlias, indexPatternName, indexPattern)
+        //Delete a replication rule which does not exist
+        Assertions.assertThatThrownBy {
+            followerClient.deleteAutoFollowPattern(connectionAlias, "dummy_conn")
+        }.isInstanceOf(ResponseException::class.java)
+                .hasMessageContaining("does not exist")
+        //Delete a replication rule which exists
+        Assertions.assertThatCode {
+            followerClient.deleteAutoFollowPattern(connectionAlias, indexPatternName)
+        }.doesNotThrowAnyException()
+
+    }
+
     fun `test removing autofollow pattern stop autofollow task`() {
         val followerClient = getClientForCluster(FOLLOWER)
         val leaderClient = getClientForCluster(LEADER)