rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-06 21:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

storcon: add spans to drain/fill ops (#8735)

Browse Source 
this way we do not need to repeat the %node_id everywhere, and we get no
stray messages in logs from within the op.
This commit is contained in:
Joonas Koivunen
2024-08-15 15:30:04 +03:00
committed by GitHub
parent d9a57aeed9
commit 52641eb853
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
storage_controller/src/service.rs
View File

@@ -4989,6 +4989,8 @@ impl Service {
cancel: cancel.clone(),
});
let span = tracing::info_span!(parent: None, "drain_node", %node_id);
tokio::task::spawn({
let service = self.clone();
let cancel = cancel.clone();
@@ -5005,21 +5007,21 @@ impl Service {
}
}
tracing::info!(%node_id, "Drain background operation starting");
tracing::info!("Drain background operation starting");
let res = service.drain_node(node_id, cancel).await;
match res {
Ok(()) => {
tracing::info!(%node_id, "Drain background operation completed successfully");
tracing::info!("Drain background operation completed successfully");
}
Err(OperationError::Cancelled) => {
tracing::info!(%node_id, "Drain background operation was cancelled");
tracing::info!("Drain background operation was cancelled");
}
Err(err) => {
tracing::error!(%node_id, "Drain background operation encountered: {err}")
tracing::error!("Drain background operation encountered: {err}")
}
}
}
});
}.instrument(span));
}
NodeSchedulingPolicy::Draining => {
return Err(ApiError::Conflict(format!(
@@ -5118,6 +5120,8 @@ impl Service {
cancel: cancel.clone(),
});
let span = tracing::info_span!(parent: None, "fill_node", %node_id);
tokio::task::spawn({
let service = self.clone();
let cancel = cancel.clone();
@@ -5134,21 +5138,21 @@ impl Service {
}
}
tracing::info!(%node_id, "Fill background operation starting");
tracing::info!("Fill background operation starting");
let res = service.fill_node(node_id, cancel).await;
match res {
Ok(()) => {
tracing::info!(%node_id, "Fill background operation completed successfully");
tracing::info!("Fill background operation completed successfully");
}
Err(OperationError::Cancelled) => {
tracing::info!(%node_id, "Fill background operation was cancelled");
tracing::info!("Fill background operation was cancelled");
}
Err(err) => {
tracing::error!(%node_id, "Fill background operation encountered: {err}")
tracing::error!("Fill background operation encountered: {err}")
}
}
}
});
}.instrument(span));
}
NodeSchedulingPolicy::Filling => {
return Err(ApiError::Conflict(format!(