Skip to content

Rename tenant shard request param #12237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Rename tenant shard request param #12237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
945ebc8
Rename tenant shard request param
ephemeralsad Jun 13, 2025
553e39c
Change mark_invisible
ephemeralsad Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions storage_controller/src/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ async fn handle_tenant_timeline_passthrough(
service: Arc<Service>,
req: Request<Body>,
) -> Result<Response<Body>, 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;

Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
Loading