diff --git a/storage_controller/src/safekeeper_client.rs b/storage_controller/src/safekeeper_client.rs index 48613a9f6f..bca0a56b12 100644 --- a/storage_controller/src/safekeeper_client.rs +++ b/storage_controller/src/safekeeper_client.rs @@ -1,3 +1,4 @@ +use crate::metrics::PageserverRequestLabelGroup; use safekeeper_api::models::{TimelineCreateRequest, TimelineStatus}; use safekeeper_client::mgmt_api::{Client, Result}; use utils::{ @@ -17,7 +18,7 @@ pub(crate) struct SafekeeperClient { macro_rules! measured_request { ($name:literal, $method:expr, $node_id: expr, $invoke:expr) => {{ - let labels = crate::metrics::PageserverRequestLabelGroup { + let labels = PageserverRequestLabelGroup { pageserver_id: $node_id, path: $name, method: $method, diff --git a/storage_controller/src/service.rs b/storage_controller/src/service.rs index 258662bc89..98613ff641 100644 --- a/storage_controller/src/service.rs +++ b/storage_controller/src/service.rs @@ -3571,7 +3571,6 @@ impl Service { models::TimelineCreateRequestMode::Bootstrap { .. } => timeline_info.last_record_lsn, models::TimelineCreateRequestMode::Branch { .. } => timeline_info.last_record_lsn, models::TimelineCreateRequestMode::ImportPgdata { .. } => { - // Can't do return Err because of async block, must do ? plus unreachable!() return Err(ApiError::InternalServerError(anyhow!( "import pgdata doesn't specify the start lsn, aborting creation on safekeepers" )))?;