Fix Search Applications bug where deleting an alias before deleting a…

…n application intermittently caused errors (elastic#106329) * Update delete object to never fail if alias does not exist * Update docs/changelog/106329.yaml * Update changelog * Fix area in changelog
fang-xing-esql · Mar 14, 2024 · fc6c2dc · fc6c2dc
1 parent b71a33c
commit fc6c2dc
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 10 deletions.
diff --git a/docs/changelog/106329.yaml b/docs/changelog/106329.yaml
@@ -0,0 +1,5 @@
+pr: 106329
+summary: Fix Search Applications bug where deleting an alias before deleting an application intermittently caused errors
+area: Application
+type: bug
+issues: []
diff --git a/.../src/yamlRestTest/resources/rest-api-spec/test/entsearch/40_search_application_delete.yml b/.../src/yamlRestTest/resources/rest-api-spec/test/entsearch/40_search_application_delete.yml
@@ -77,3 +77,18 @@ teardown:
         name: test-search-application-to-delete
 
   - match: { acknowledged: true }
+
+---
+"Delete Search Application - Alias does not exist as alias was explicitly removed":
+  - do:
+      indices.update_aliases:
+        body:
+          actions:
+            - remove:
+                index: test-index
+                alias: test-search-application-to-delete
+
+      search_application.delete:
+        name: test-search-application-to-delete
+
+  - match: { acknowledged: true }
diff --git a/...c/main/java/org/elasticsearch/xpack/application/search/SearchApplicationIndexService.java b/...c/main/java/org/elasticsearch/xpack/application/search/SearchApplicationIndexService.java
@@ -330,16 +330,21 @@ private void removeAlias(String searchAliasName, ActionListener<AcknowledgedResp
         IndicesAliasesRequest aliasesRequest = new IndicesAliasesRequest().addAliasAction(
             IndicesAliasesRequest.AliasActions.remove().aliases(searchAliasName).indices("*")
         );
-        client.admin()
-            .indices()
-            .aliases(
-                aliasesRequest,
-                new DelegatingIndexNotFoundActionListener<>(
-                    searchAliasName,
-                    listener,
-                    (l, acknowledgedResponse) -> l.onResponse(AcknowledgedResponse.TRUE)
-                )
-            );
+        client.admin().indices().aliases(aliasesRequest, new ActionListener<>() {
+            @Override
+            public void onResponse(AcknowledgedResponse acknowledgedResponse) {
+                listener.onResponse(AcknowledgedResponse.TRUE);
+            }
+
+            @Override
+            public void onFailure(Exception e) {
+                if (e instanceof ResourceNotFoundException) {
+                    listener.onResponse(AcknowledgedResponse.TRUE);
+                } else {
+                    listener.onFailure(e);
+                }
+            }
+        });
     }
 
     /**