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

stub api impl

Browse Source
This commit is contained in:
Christian Schwarz
2025-06-02 11:13:02 +02:00
parent afa35eea87
commit f36520eb94
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/safekeeper_api/src/models.rs
View File

@@ -10,6 +10,7 @@ use utils::generation::Generation;
use utils::id::{NodeId, TenantId, TenantTimelineId, TimelineId};
use utils::lsn::Lsn;
use utils::pageserver_feedback::PageserverFeedback;
use utils::shard::{ShardIndex, TenantShardId};
use crate::membership::Configuration;
use crate::{ServerInfo, Term};
@@ -320,6 +321,7 @@ pub enum TenantShardPageserverAttachmentChange {
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct TenantShardPageserverAttachment {
pub ps_id: NodeId,
pub shard: ShardIndex,
pub generation: Generation,
pub ps_id: NodeId,
}

3
safekeeper/client/src/mgmt_api.rs
View File

@@ -196,7 +196,8 @@ impl Client {
body: TenantShardPageserverAttachmentChange,
) -> Result<()> {
let uri = format!(
"{}/v1/tenant/{tenant_shard_id}/pageserver_attachments",
"{}/v1/tenant/{}/pageserver_attachments",
tenant_shard_id.tenant_id,
self.mgmt_api_endpoint
);
let resp = self.post(uri, body).await?;

23
safekeeper/src/http/routes.rs
View File

@@ -18,8 +18,8 @@ use pem::Pem;
use postgres_ffi::WAL_SEGMENT_SIZE;
use safekeeper_api::models::{
AcceptorStateStatus, PullTimelineRequest, SafekeeperStatus, SkTimelineInfo, TenantDeleteResult,
TermSwitchApiEntry, TimelineCopyRequest, TimelineCreateRequest, TimelineDeleteResult,
TimelineStatus, TimelineTermBumpRequest,
TenantShardPageserverAttachmentChange, TermSwitchApiEntry, TimelineCopyRequest,
TimelineCreateRequest, TimelineDeleteResult, TimelineStatus, TimelineTermBumpRequest,
};
use safekeeper_api::{ServerInfo, membership, models};
use storage_broker::proto::{SafekeeperTimelineInfo, TenantTimelineId as ProtoTenantTimelineId};
@@ -67,6 +67,22 @@ fn check_permission(request: &Request<Body>, tenant_id: Option<TenantId>) -> Res
})
}
async fn post_tenant_pageserver_attachments(mut request: Request<Body>) -> Result<(), ApiError> {
let tenant_id = parse_request_param(&request, "tenant_id")?;
check_permission(&request, Some(tenant_id))?;
let body: TenantShardPageserverAttachmentChange = json_request(&mut request).await?;
let global_timelines = get_global_timelines(&request);
match body {
TenantShardPageserverAttachmentChange::Attach(tenant_shard_pageserver_attachment) => {
todo!()
}
TenantShardPageserverAttachmentChange::Detach(tenant_shard_pageserver_attachment) => {
todo!()
}
}
}
/// Deactivates all timelines for the tenant and removes its data directory.
/// See `timeline_delete_handler`.
async fn tenant_delete_handler(mut request: Request<Body>) -> Result<Response<Body>, ApiError> {
@@ -718,6 +734,9 @@ pub fn make_router(
})
})
.get("/v1/utilization", |r| request_span(r, utilization_handler))
.post("/v1/tenant/:tenant_id/pageserver_attachments", |r| {
request_span(r, post_tenant_pageserver_attachments)
})
.delete("/v1/tenant/:tenant_id", |r| {
request_span(r, tenant_delete_handler)
})

5
storage_controller/src/service/sk_ps_discovery.rs
View File

@@ -16,6 +16,7 @@ use utils::{
generation::Generation,
id::{NodeId, TenantId},
logging::SecretString,
shard::ShardIndex,
};
use crate::{
@@ -223,6 +224,10 @@ impl DeliveryAttempt {
let body = {
let val = TenantShardPageserverAttachment {
shard: ShardIndex {
shard_number: utils::shard::ShardNumber(self.work.shard_number as u8),
shard_count: utils::shard::ShardCount(self.work.shard_count as u8),
},
ps_id: NodeId(self.work.ps_id as u64),
generation: Generation::new(self.work.ps_generation as u32),
};