Skip to content

Commit 2ee0f42

Browse files
committed
fix(page_service): lsn lease API puts tenant_shard_id in tenant_id tracing field
The LSN lease api actually accepts a tenant_shard_id, not a tenant_id. But we put the Display of the tenant_shard_id into the tenant_id field. This PR fixes it. Refs - fixes https://databricks.atlassian.net/browse/LKB-2930
1 parent 8a9f1dd commit 2ee0f42

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pageserver/src/page_service.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ use crate::pgdatadir_mapping::{LsnRange, Version};
7676
use crate::span::{
7777
debug_assert_current_span_has_tenant_and_timeline_id,
7878
debug_assert_current_span_has_tenant_and_timeline_id_no_shard_id,
79-
debug_assert_current_span_has_tenant_id,
8079
};
8180
use crate::task_mgr::{self, COMPUTE_REQUEST_RUNTIME, TaskKind};
8281
use crate::tenant::mgr::{
@@ -2194,6 +2193,8 @@ impl PageServerHandler {
21942193
where
21952194
IO: AsyncRead + AsyncWrite + Send + Sync + Unpin,
21962195
{
2196+
debug_assert_current_span_has_tenant_and_timeline_id_no_shard_id();
2197+
21972198
let timeline = self
21982199
.timeline_handles
21992200
.as_mut()
@@ -2249,7 +2250,7 @@ impl PageServerHandler {
22492250
where
22502251
IO: AsyncRead + AsyncWrite + Send + Sync + Unpin,
22512252
{
2252-
debug_assert_current_span_has_tenant_id();
2253+
debug_assert_current_span_has_tenant_and_timeline_id_no_shard_id();
22532254

22542255
let timeline = self
22552256
.timeline_handles
@@ -3224,7 +3225,7 @@ where
32243225
lsn,
32253226
}) => {
32263227
tracing::Span::current()
3227-
.record("tenant_id", field::display(tenant_shard_id))
3228+
.record("tenant_id", field::display(tenant_shard_id.tenant_id))
32283229
.record("timeline_id", field::display(timeline_id));
32293230

32303231
self.check_permission(Some(tenant_shard_id.tenant_id))?;
@@ -3256,7 +3257,7 @@ where
32563257
lsn,
32573258
}) => {
32583259
tracing::Span::current()
3259-
.record("tenant_id", field::display(tenant_shard_id))
3260+
.record("tenant_id", field::display(tenant_shard_id.tenant_id))
32603261
.record("timeline_id", field::display(timeline_id));
32613262

32623263
self.check_permission(Some(tenant_shard_id.tenant_id))?;

0 commit comments

Comments
 (0)