From ed0aa11687f28b2bc3b660fbeb118d6ff8898076 Mon Sep 17 00:00:00 2001
From: Eshan Chatterjee <eshan2001221@gmail.com>
Date: Tue, 2 Apr 2024 11:43:15 +0530
Subject: [PATCH] fix: delete node endpoint

---
 server/src/handlers/http/cluster/mod.rs   | 12 ++++++++----
 server/src/handlers/http/cluster/utils.rs |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/server/src/handlers/http/cluster/mod.rs b/server/src/handlers/http/cluster/mod.rs
index a5a8c8648..8759a39e1 100644
--- a/server/src/handlers/http/cluster/mod.rs
+++ b/server/src/handlers/http/cluster/mod.rs
@@ -18,15 +18,14 @@
 
 pub mod utils;
 
-use crate::handlers::http::cluster::utils::{
-    check_liveness, ingester_meta_filename, to_url_string,
-};
+use crate::handlers::http::cluster::utils::{check_liveness, to_url_string};
 use crate::handlers::http::ingest::PostError;
 use crate::handlers::http::logstream::error::StreamError;
 use crate::handlers::{STATIC_SCHEMA_FLAG, TIME_PARTITION_KEY};
 use crate::option::CONFIG;
 
 use crate::metrics::prom_utils::Metrics;
+use crate::storage::object_storage::ingester_metadata_path;
 use crate::storage::ObjectStorageError;
 use crate::storage::PARSEABLE_ROOT_DIRECTORY;
 use actix_web::http::header;
@@ -380,7 +379,12 @@ pub async fn remove_ingester(req: HttpRequest) -> Result<impl Responder, PostErr
         return Err(PostError::Invalid(anyhow::anyhow!("Node Online")));
     }
 
-    let ingester_meta_filename = ingester_meta_filename(&domain_name);
+    let url = Url::parse(&domain_name).unwrap();
+    let ingester_meta_filename = ingester_metadata_path(
+        url.host_str().unwrap().to_owned(),
+        url.port().unwrap().to_string(),
+    )
+    .to_string();
     let object_store = CONFIG.storage().get_object_store();
     let msg = match object_store
         .try_delete_ingester_meta(ingester_meta_filename)
diff --git a/server/src/handlers/http/cluster/utils.rs b/server/src/handlers/http/cluster/utils.rs
index 1dea1c9e9..fd1e30ea8 100644
--- a/server/src/handlers/http/cluster/utils.rs
+++ b/server/src/handlers/http/cluster/utils.rs
@@ -243,6 +243,8 @@ pub async fn send_stats_request(
 }
 
 /// domain_name needs to be http://ip:port
+/// dead code for now
+#[allow(dead_code)]
 pub fn ingester_meta_filename(domain_name: &str) -> String {
     if domain_name.starts_with("http://") | domain_name.starts_with("https://") {
         let url = Url::parse(domain_name).unwrap();