rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-14 17:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increase verbosity of invalid compute status logs

Browse Source 
It should reduce a round trip of code inspection when looking at the
logs.

Signed-off-by: Tristan Partin <tristan@neon.tech>
This commit is contained in:
Tristan Partin
2024-11-05 14:10:03 -06:00
parent e30f5fb922
commit 500206ad0f
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
compute_tools/src/http/api.rs
View File

@@ -84,8 +84,9 @@ async fn routes(req: Request<Body>, compute: &Arc<ComputeNode>) -> Response<Body
let status = compute.get_status();
if status != ComputeStatus::Running {
let msg = format!(
"invalid compute status for check_writability request: {:?}",
status
"invalid compute status for check_writability request: {}, need {}",
status,
ComputeStatus::Running
);
error!(msg);
return Response::new(Body::from(msg));
@@ -106,8 +107,9 @@ async fn routes(req: Request<Body>, compute: &Arc<ComputeNode>) -> Response<Body
let status = compute.get_status();
if status != ComputeStatus::Running {
let msg = format!(
"invalid compute status for extensions request: {:?}",
status
"invalid compute status for extensions request: {}, need {}",
status,
ComputeStatus::Running
);
error!(msg);
return render_json_error(&msg, StatusCode::PRECONDITION_FAILED);
@@ -205,8 +207,9 @@ async fn routes(req: Request<Body>, compute: &Arc<ComputeNode>) -> Response<Body
let status = compute.get_status();
if status != ComputeStatus::Running {
let msg = format!(
"invalid compute status for set_role_grants request: {:?}",
status
"invalid compute status for set_role_grants request: {}, need {}",
status,
ComputeStatus::Running
);
error!(msg);
return render_json_error(&msg, StatusCode::PRECONDITION_FAILED);
@@ -250,8 +253,9 @@ async fn routes(req: Request<Body>, compute: &Arc<ComputeNode>) -> Response<Body
let status = compute.get_status();
if status != ComputeStatus::Running {
let msg = format!(
"invalid compute status for extensions request: {:?}",
status
"invalid compute status for extensions request: {}, need {}",
status,
ComputeStatus::Running
);
error!(msg);
return Response::new(Body::from(msg));
@@ -383,10 +387,12 @@ async fn handle_configure_request(
// ```
{
let mut state = compute.state.lock().unwrap();
if state.status != ComputeStatus::Empty && state.status != ComputeStatus::Running {
if !matches!(state.status, ComputeStatus::Empty | ComputeStatus::Running) {
let msg = format!(
"invalid compute status for configuration request: {:?}",
state.status.clone()
"invalid compute status for configuration request: {}, cannot be {} or {}",
state.status,
ComputeStatus::Empty,
ComputeStatus::Running
);
return Err((msg, StatusCode::PRECONDITION_FAILED));
}
@@ -462,10 +468,12 @@ async fn handle_terminate_request(compute: &Arc<ComputeNode>) -> Result<(), (Str
if state.status == ComputeStatus::Terminated {
return Ok(());
}
if state.status != ComputeStatus::Empty && state.status != ComputeStatus::Running {
if !matches!(state.status, ComputeStatus::Empty | ComputeStatus::Running) {
let msg = format!(
"invalid compute status for termination request: {}",
state.status
"invalid compute status for termination request: {}, cannot be {} or {}",
state.status,
ComputeStatus::Empty,
ComputeStatus::Running,
);
return Err((msg, StatusCode::PRECONDITION_FAILED));
}

5
libs/compute_api/src/responses.rs
View File

@@ -66,14 +66,15 @@ pub enum ComputeStatus {
impl Display for ComputeStatus {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
// snake_case matches the serde implementation
match self {
ComputeStatus::Empty => f.write_str("empty"),
ComputeStatus::ConfigurationPending => f.write_str("configuration-pending"),
ComputeStatus::ConfigurationPending => f.write_str("configuration_pending"),
ComputeStatus::Init => f.write_str("init"),
ComputeStatus::Running => f.write_str("running"),
ComputeStatus::Configuration => f.write_str("configuration"),
ComputeStatus::Failed => f.write_str("failed"),
ComputeStatus::TerminationPending => f.write_str("termination-pending"),
ComputeStatus::TerminationPending => f.write_str("termination_pending"),
ComputeStatus::Terminated => f.write_str("terminated"),
}
}