From 945ebc8411222f70a37a037e8cba6fd0bcb491f3 Mon Sep 17 00:00:00 2001 From: Aleksandr Sarantsev Date: Fri, 13 Jun 2025 21:42:22 +0400 Subject: [PATCH 1/2] Rename tenant shard request param --- storage_controller/src/http.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/storage_controller/src/http.rs b/storage_controller/src/http.rs index 7051a3326d46..eb378d5ddf34 100644 --- a/storage_controller/src/http.rs +++ b/storage_controller/src/http.rs @@ -676,7 +676,7 @@ async fn handle_tenant_timeline_passthrough( service: Arc, req: Request, ) -> Result, ApiError> { - let tenant_or_shard_id: TenantShardId = parse_request_param(&req, "tenant_id")?; + let tenant_or_shard_id: TenantShardId = parse_request_param(&req, "tenant_shard_id")?; check_permissions(&req, Scope::PageServerApi)?; maybe_rate_limit(&req, tenant_or_shard_id.tenant_id).await; @@ -2470,7 +2470,7 @@ pub fn make_router( }, ) // Tenant detail GET passthrough to shard zero: - .get("/v1/tenant/:tenant_id", |r| { + .get("/v1/tenant/:tenant_shard_id", |r| { tenant_service_handler( r, handle_tenant_timeline_passthrough, @@ -2480,7 +2480,7 @@ pub fn make_router( // The `*` in the URL is a wildcard: any tenant/timeline GET APIs on the pageserver // are implicitly exposed here. This must be last in the list to avoid // taking precedence over other GET methods we might implement by hand. - .get("/v1/tenant/:tenant_id/*", |r| { + .get("/v1/tenant/:tenant_shard_id/*", |r| { tenant_service_handler( r, handle_tenant_timeline_passthrough, From 553e39c2773e5840c720c90d86e56f89a4330d43 Mon Sep 17 00:00:00 2001 From: Aleksandr Sarantsev Date: Fri, 13 Jun 2025 23:01:55 +0400 Subject: [PATCH 2/2] Change mark_invisible --- storage_controller/src/http.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage_controller/src/http.rs b/storage_controller/src/http.rs index eb378d5ddf34..545c9773e694 100644 --- a/storage_controller/src/http.rs +++ b/storage_controller/src/http.rs @@ -2489,7 +2489,7 @@ pub fn make_router( }) // Tenant timeline mark_invisible passthrough to shard zero .put( - "/v1/tenant/:tenant_id/timeline/:timeline_id/mark_invisible", + "/v1/tenant/:tenant_shard_id/timeline/:timeline_id/mark_invisible", |r| { tenant_service_handler( r,