From 1edf84d6c721c9d0f3c15b1180bfa4cf2bb6db9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arpad=20M=C3=BCller?= <arpad@neon.tech>
Date: Thu, 22 May 2025 14:48:10 +0200
Subject: [PATCH] fixfix

---
 pageserver/src/tenant/storage_layer/layer.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pageserver/src/tenant/storage_layer/layer.rs b/pageserver/src/tenant/storage_layer/layer.rs
index 3090a5cc6f..3c2cef4d51 100644
--- a/pageserver/src/tenant/storage_layer/layer.rs
+++ b/pageserver/src/tenant/storage_layer/layer.rs
@@ -1780,13 +1780,19 @@ impl DownloadedLayer {
                 "these are the same, just avoiding the upgrade"
             );
 
+            let (ex_tenant_id, ex_timeline_id) =
+                if let Some((tenant_id, timeline_id)) = owner.template_ttid {
+                    (tenant_id.tenant_id, timeline_id)
+                } else {
+                    (owner.desc.tenant_shard_id.tenant_id, owner.desc.timeline_id)
+                };
             let res = if owner.desc.is_delta {
                 let ctx = RequestContextBuilder::from(ctx)
                     .page_content_kind(crate::context::PageContentKind::DeltaLayerSummary)
                     .attached_child();
                 let summary = Some(delta_layer::Summary::expected(
-                    owner.desc.tenant_shard_id.tenant_id,
-                    owner.desc.timeline_id,
+                    ex_tenant_id,
+                    ex_timeline_id,
                     owner.desc.key_range.clone(),
                     owner.desc.lsn_range.clone(),
                 ));
@@ -1804,8 +1810,8 @@ impl DownloadedLayer {
                     .attached_child();
                 let lsn = owner.desc.image_layer_lsn();
                 let summary = Some(image_layer::Summary::expected(
-                    owner.desc.tenant_shard_id.tenant_id,
-                    owner.desc.timeline_id,
+                    ex_tenant_id,
+                    ex_timeline_id,
                     owner.desc.key_range.clone(),
                     lsn,
                 ));