Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improved error messages for remove ingestor API #843

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions server/src/handlers/http/cluster/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,9 @@ pub async fn remove_ingestor(req: HttpRequest) -> Result<impl Responder, PostErr
let domain_name = to_url_string(domain_name);

if check_liveness(&domain_name).await {
return Err(PostError::Invalid(anyhow::anyhow!("Node Online")));
return Err(PostError::Invalid(anyhow::anyhow!(
"The ingestor is currently live and cannot be removed"
)));
}
let object_store = CONFIG.storage().get_object_store();

Expand Down Expand Up @@ -500,13 +502,13 @@ pub async fn remove_ingestor(req: HttpRequest) -> Result<impl Responder, PostErr
.await
{
Ok(_) => {
format!("Node {} Removed Successfully", domain_name)
format!("Ingestor {} removed successfully", domain_name)
}
Err(err) => {
if matches!(err, ObjectStorageError::IoError(_)) {
format!("Node {} Not Found", domain_name)
format!("Ingestor {} is not found", domain_name)
} else {
format!("Error Removing Node {}\n Reason: {}", domain_name, err)
format!("Error removing ingestor {}\n Reason: {}", domain_name, err)
}
}
};
Expand Down
Loading