From be2a9fb685c76aceda78bbf10ccf6ad4dc227474 Mon Sep 17 00:00:00 2001
From: Philippe Rolet <pr@dust.tt>
Date: Mon, 23 Dec 2024 19:19:00 +0100
Subject: [PATCH] [Elasticsearch] Fail on deletes, except when node is already
 absent (#9621)

Description
---
As per title

Risk
---
low
Introduces failures on deletes that are not from a missing node, but we should spot and act on those

Deploy
---
core
---
 core/src/search_stores/search_store.rs | 40 +++++++++++++++-----------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/core/src/search_stores/search_store.rs b/core/src/search_stores/search_store.rs
index b0ac5b24bf52..7ebb332f7f93 100644
--- a/core/src/search_stores/search_store.rs
+++ b/core/src/search_stores/search_store.rs
@@ -187,16 +187,21 @@ impl SearchStore for ElasticsearchSearchStore {
             .send()
             .await?;
         // todo(kw-search): fail on error
-        if !response.status_code().is_success() {
-            let error = response.json::<serde_json::Value>().await?;
-            error!(
-                error = %error,
-                globally_unique_id = node.unique_id(),
-                "[ElasticsearchSearchStore] Failed to delete {}",
-                node.node_type.to_string()
-            );
+        match response.status_code().is_success() {
+            true => Ok(()),
+            false => {
+                let error = response.json::<serde_json::Value>().await?;
+                if error["result"] == "not_found" {
+                    info!(
+                        globally_unique_id = node.unique_id(),
+                        "[ElasticsearchSearchStore] Delete node on non-existent document"
+                    );
+                    Ok(())
+                } else {
+                    Err(anyhow::anyhow!("Failed to delete node {}", error))
+                }
+            }
         }
-        Ok(())
     }
 
     async fn delete_data_source_nodes(&self, data_source_id: &str) -> Result<()> {
@@ -211,15 +216,16 @@ impl SearchStore for ElasticsearchSearchStore {
             .send()
             .await?;
         // todo(kw-search): fail on error
-        if !response.status_code().is_success() {
-            let error = response.json::<serde_json::Value>().await?;
-            error!(
-                error = %error,
-                data_source_id = data_source_id,
-                "[ElasticsearchSearchStore] Failed to delete data source nodes"
-            );
+        match response.status_code().is_success() {
+            true => Ok(()),
+            false => {
+                let error = response.json::<serde_json::Value>().await?;
+                Err(anyhow::anyhow!(
+                    "Failed to delete data source nodes {}",
+                    error
+                ))
+            }
         }
-        Ok(())
     }
 
     fn clone_box(&self) -> Box<dyn SearchStore + Sync + Send> {