mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-14 17:02:56 +00:00
Updates storage components to edition 2024. We like to stay on the latest edition if possible. There is no functional changes, however some code changes had to be done to accommodate the edition's breaking changes. The PR has two commits: * the first commit updates storage crates to edition 2024 and appeases `cargo clippy` by changing code. i have accidentially ran the formatter on some files that had other edits. * the second commit performs a `cargo fmt` I would recommend a closer review of the first commit and a less close review of the second one (as it just runs `cargo fmt`). part of https://github.com/neondatabase/neon/issues/10918
121 lines
3.4 KiB
Rust
121 lines
3.4 KiB
Rust
use safekeeper_api::models::{
|
|
PullTimelineRequest, PullTimelineResponse, SafekeeperUtilization, TimelineCreateRequest,
|
|
TimelineStatus,
|
|
};
|
|
use safekeeper_client::mgmt_api::{Client, Result};
|
|
use utils::id::{NodeId, TenantId, TimelineId};
|
|
use utils::logging::SecretString;
|
|
|
|
use crate::metrics::PageserverRequestLabelGroup;
|
|
|
|
/// Thin wrapper around [`safekeeper_client::mgmt_api::Client`]. It allows the storage
|
|
/// controller to collect metrics in a non-intrusive manner.
|
|
///
|
|
/// Analogous to [`crate::pageserver_client::PageserverClient`].
|
|
#[derive(Debug, Clone)]
|
|
pub(crate) struct SafekeeperClient {
|
|
inner: Client,
|
|
node_id_label: String,
|
|
}
|
|
|
|
macro_rules! measured_request {
|
|
($name:literal, $method:expr, $node_id: expr, $invoke:expr) => {{
|
|
let labels = PageserverRequestLabelGroup {
|
|
pageserver_id: $node_id,
|
|
path: $name,
|
|
method: $method,
|
|
};
|
|
|
|
let latency = &crate::metrics::METRICS_REGISTRY
|
|
.metrics_group
|
|
.storage_controller_safekeeper_request_latency;
|
|
let _timer_guard = latency.start_timer(labels.clone());
|
|
|
|
let res = $invoke;
|
|
|
|
if res.is_err() {
|
|
let error_counters = &crate::metrics::METRICS_REGISTRY
|
|
.metrics_group
|
|
.storage_controller_pageserver_request_error;
|
|
error_counters.inc(labels)
|
|
}
|
|
|
|
res
|
|
}};
|
|
}
|
|
|
|
impl SafekeeperClient {
|
|
#[allow(dead_code)]
|
|
pub(crate) fn new(
|
|
node_id: NodeId,
|
|
mgmt_api_endpoint: String,
|
|
jwt: Option<SecretString>,
|
|
) -> Self {
|
|
Self {
|
|
inner: Client::from_client(reqwest::Client::new(), mgmt_api_endpoint, jwt),
|
|
node_id_label: node_id.0.to_string(),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn from_client(
|
|
node_id: NodeId,
|
|
raw_client: reqwest::Client,
|
|
mgmt_api_endpoint: String,
|
|
jwt: Option<SecretString>,
|
|
) -> Self {
|
|
Self {
|
|
inner: Client::from_client(raw_client, mgmt_api_endpoint, jwt),
|
|
node_id_label: node_id.0.to_string(),
|
|
}
|
|
}
|
|
|
|
#[allow(dead_code)]
|
|
pub(crate) async fn create_timeline(
|
|
&self,
|
|
req: &TimelineCreateRequest,
|
|
) -> Result<TimelineStatus> {
|
|
measured_request!(
|
|
"create_timeline",
|
|
crate::metrics::Method::Post,
|
|
&self.node_id_label,
|
|
self.inner.create_timeline(req).await
|
|
)
|
|
}
|
|
|
|
#[allow(dead_code)]
|
|
pub(crate) async fn delete_timeline(
|
|
&self,
|
|
tenant_id: TenantId,
|
|
timeline_id: TimelineId,
|
|
) -> Result<TimelineStatus> {
|
|
measured_request!(
|
|
"delete_timeline",
|
|
crate::metrics::Method::Delete,
|
|
&self.node_id_label,
|
|
self.inner.delete_timeline(tenant_id, timeline_id).await
|
|
)
|
|
}
|
|
|
|
#[allow(dead_code)]
|
|
pub(crate) async fn pull_timeline(
|
|
&self,
|
|
req: &PullTimelineRequest,
|
|
) -> Result<PullTimelineResponse> {
|
|
measured_request!(
|
|
"pull_timeline",
|
|
crate::metrics::Method::Post,
|
|
&self.node_id_label,
|
|
self.inner.pull_timeline(req).await
|
|
)
|
|
}
|
|
|
|
pub(crate) async fn get_utilization(&self) -> Result<SafekeeperUtilization> {
|
|
measured_request!(
|
|
"utilization",
|
|
crate::metrics::Method::Get,
|
|
&self.node_id_label,
|
|
self.inner.utilization().await
|
|
)
|
|
}
|
|
}
|