Add support to ignore updates on autofollow pattern

Signed-off-by: Ankit Kala <[email protected]>
opensearch-project · Sep 11, 2024 · 0ab2f32 · 0ab2f32
1 parent f7bcbb4
commit 0ab2f32
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/test/kotlin/org/opensearch/replication/ReplicationHelpers.kt b/src/test/kotlin/org/opensearch/replication/ReplicationHelpers.kt
@@ -20,6 +20,7 @@ import org.opensearch.action.support.master.AcknowledgedResponse
 import org.opensearch.client.Request
 import org.opensearch.client.RequestOptions
 import org.opensearch.client.Response
+import org.opensearch.client.ResponseException
 import org.opensearch.client.RestHighLevelClient
 import org.opensearch.common.settings.Settings
 import org.opensearch.common.unit.TimeValue
@@ -325,7 +326,8 @@ fun RestHighLevelClient.waitForReplicationStop(index: String, waitFor : TimeValu
 fun RestHighLevelClient.updateAutoFollowPattern(connection: String, patternName: String, pattern: String,
                                                 settings: Settings = Settings.EMPTY,
                                                 useRoles: UseRoles = UseRoles(),
-                                                requestOptions: RequestOptions = RequestOptions.DEFAULT) {
+                                                requestOptions: RequestOptions = RequestOptions.DEFAULT,
+                                                ignoreIfExists: Boolean = false) {
     val lowLevelRequest = Request("POST", REST_AUTO_FOLLOW_PATTERN)
     if (settings == Settings.EMPTY) {
         lowLevelRequest.setJsonEntity("""{
@@ -350,9 +352,14 @@ fun RestHighLevelClient.updateAutoFollowPattern(connection: String, patternName:
                                      }""")
     }
     lowLevelRequest.setOptions(requestOptions)
-    val lowLevelResponse = lowLevelClient.performRequest(lowLevelRequest)
-    val response = getAckResponse(lowLevelResponse)
-    assertThat(response.isAcknowledged).isTrue()
+    try {
+        val lowLevelResponse = lowLevelClient.performRequest(lowLevelRequest)
+        val response = getAckResponse(lowLevelResponse)
+        assertThat(response.isAcknowledged).isTrue()
+    } catch (e: ResponseException) {
+        // Skip if ignoreIfExists is true and exception contains resource_already_exists_exception
+        if  ((ignoreIfExists == true && e.message?.contains("resource_already_exists_exception")!!) == false) throw e
+    }
 }
 
 fun RestHighLevelClient.AutoFollowStats() : Map<String, Any>  {

diff --git a/src/test/kotlin/org/opensearch/replication/integ/rest/UpdateAutoFollowPatternIT.kt b/src/test/kotlin/org/opensearch/replication/integ/rest/UpdateAutoFollowPatternIT.kt
@@ -376,7 +376,7 @@ class UpdateAutoFollowPatternIT: MultiClusterRestTestCase() {
                 // Add replication start block
                 followerClient.updateReplicationStartBlockSetting(true)
                 createRandomIndex(leaderClient)
-                followerClient.updateAutoFollowPattern(connectionAlias, indexPatternName, indexPattern)
+                followerClient.updateAutoFollowPattern(connectionAlias, indexPatternName, indexPattern, ignoreIfExists=true)
                 sleep(95000) // wait for auto follow trigger in the worst case
                 // verify both index replication tasks and autofollow tasks
                 // Replication shouldn't have been started - (repeat-1) tasks as for current loop index shouldn't be
@@ -525,7 +525,11 @@ class UpdateAutoFollowPatternIT: MultiClusterRestTestCase() {
 
     private fun assertValidPatternValidation(followerClient: RestHighLevelClient, pattern: String) {
         Assertions.assertThatCode {
-            followerClient.updateAutoFollowPattern(connectionAlias, indexPatternName, pattern)
+            try {
+                followerClient.updateAutoFollowPattern(connectionAlias, indexPatternName, pattern)
+            } finally {
+                followerClient.deleteAutoFollowPattern(connectionAlias, indexPatternName)
+            }
         }.doesNotThrowAnyException()
     }