update to generic node

Author: nikhilsinhaparseable

src/handlers/http/modal/query_server.rs

@@ -333,13 +333,13 @@ impl QueryServer {
                         .authorize(Action::ListClusterMetrics),
                 ),
             )
-            // DELETE "/cluster/{ingestor_domain:port}" ==> Delete an ingestor from the cluster
+            // DELETE "/cluster/{node_domain:port}" ==> Delete a node from the cluster
             .service(
-                web::scope("/{ingestor}").service(
+                web::scope("/{node_url}").service(
                     web::resource("").route(
                         web::delete()
                             .to(cluster::remove_node)
-                            .authorize(Action::Deleteingestor),
+                            .authorize(Action::DeleteNode),
                     ),
                 ),
             )

src/rbac/role.rs

@@ -50,7 +50,7 @@ pub enum Action {
     QueryLLM,
     ListCluster,
     ListClusterMetrics,
-    Deleteingestor,
+    DeleteNode,
     All,
     GetAnalytics,
     ListDashboard,
@@ -128,7 +128,7 @@ impl RoleBuilder {
                 | Action::DeleteCorrelation
                 | Action::GetCorrelation
                 | Action::PutCorrelation
-                | Action::Deleteingestor
+                | Action::DeleteNode
                 | Action::PutHotTierEnabled
                 | Action::GetHotTierEnabled
                 | Action::DeleteHotTierEnabled

src/storage/azure_blob.rs

@@ -644,11 +644,8 @@ impl ObjectStorage for BlobStore {
         Ok(())
     }
 
-    async fn try_delete_node_meta(
-        &self,
-        ingestor_filename: String,
-    ) -> Result<(), ObjectStorageError> {
-        let file = RelativePathBuf::from(&ingestor_filename);
+    async fn try_delete_node_meta(&self, node_filename: String) -> Result<(), ObjectStorageError> {
+        let file = RelativePathBuf::from(&node_filename);
         match self.client.delete(&to_object_store_path(&file)).await {
             Ok(_) => Ok(()),
             Err(err) => {
@@ -658,7 +655,7 @@ impl ObjectStorage for BlobStore {
                     error!("Node does not exist");
                     Err(err.into())
                 } else {
-                    error!("Error deleting ingestor meta file: {:?}", err);
+                    error!("Error deleting node meta file: {:?}", err);
                     Err(err.into())
                 }
             }

src/storage/localfs.rs

@@ -325,11 +325,8 @@ impl ObjectStorage for LocalFS {
         Ok(fs::remove_dir_all(path).await?)
     }
 
-    async fn try_delete_node_meta(
-        &self,
-        ingestor_filename: String,
-    ) -> Result<(), ObjectStorageError> {
-        let path = self.root.join(ingestor_filename);
+    async fn try_delete_node_meta(&self, node_filename: String) -> Result<(), ObjectStorageError> {
+        let path = self.root.join(node_filename);
         Ok(fs::remove_file(path).await?)
     }
 

src/storage/object_storage.rs

@@ -201,10 +201,7 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
         &self,
         stream_name: &str,
     ) -> Result<Vec<RelativePathBuf>, ObjectStorageError>;
-    async fn try_delete_node_meta(
-        &self,
-        ingestor_filename: String,
-    ) -> Result<(), ObjectStorageError>;
+    async fn try_delete_node_meta(&self, node_filename: String) -> Result<(), ObjectStorageError>;
     /// Returns the amount of time taken by the `ObjectStore` to perform a get
     /// call.
     async fn get_latency(&self) -> Duration {

src/storage/s3.rs

@@ -727,11 +727,8 @@ impl ObjectStorage for S3 {
         Ok(())
     }
 
-    async fn try_delete_node_meta(
-        &self,
-        ingestor_filename: String,
-    ) -> Result<(), ObjectStorageError> {
-        let file = RelativePathBuf::from(&ingestor_filename);
+    async fn try_delete_node_meta(&self, node_filename: String) -> Result<(), ObjectStorageError> {
+        let file = RelativePathBuf::from(&node_filename);
         match self.client.delete(&to_object_store_path(&file)).await {
             Ok(_) => Ok(()),
             Err(err) => {
@@ -741,7 +738,7 @@ impl ObjectStorage for S3 {
                     error!("Node does not exist");
                     Err(err.into())
                 } else {
-                    error!("Error deleting ingestor meta file: {:?}", err);
+                    error!("Error deleting node meta file: {:?}", err);
                     Err(err.into())
                 }
             }