From 3a098a4eb25cfd8d47025efea745c9f724ecdac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arpad=20M=C3=BCller?= <arpad@neon.tech>
Date: Thu, 22 May 2025 16:04:08 +0200
Subject: [PATCH] fixes

---
 pageserver/src/tenant.rs              |  4 ++--
 test_runner/regress/test_templates.py | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs
index 0706fd628e..7b66aa7bf4 100644
--- a/pageserver/src/tenant.rs
+++ b/pageserver/src/tenant.rs
@@ -2753,7 +2753,7 @@ impl TenantShard {
         } = params;
 
         // 0. create a guard to prevent parallel creation attempts.
-        let timeline_create_guard = match self
+        let _timeline_create_guard = match self
             .start_creating_timeline(
                 new_timeline_id,
                 CreateTimelineIdempotency::Template(template_tenant_id, template_timeline_id),
@@ -2827,7 +2827,7 @@ impl TenantShard {
                 warn!("timeline not available directly after attach");
                 panic!();
             };
-            let mut offloaded_timelines = self.timelines_offloaded.lock().unwrap();
+            let offloaded_timelines = self.timelines_offloaded.lock().unwrap();
             self.initialize_gc_info(&timelines, &offloaded_timelines, Some(new_timeline_id));
 
             Arc::clone(timeline)
diff --git a/test_runner/regress/test_templates.py b/test_runner/regress/test_templates.py
index 4867e52873..ca58e27f2a 100644
--- a/test_runner/regress/test_templates.py
+++ b/test_runner/regress/test_templates.py
@@ -138,7 +138,7 @@ def test_template_smoke(neon_env_builder: NeonEnvBuilder):
     log.info("starting timeline creation")
     start = time.monotonic()
 
-    import_branch_name = "imported"
+    branch_name = "on_template"
     env.storage_controller.timeline_create(
         new_tenant_id,
         {
@@ -147,7 +147,7 @@ def test_template_smoke(neon_env_builder: NeonEnvBuilder):
             "template_timeline_id": str(template_timeline_id),
         },
     )
-    env.neon_cli.mappings_map_branch(import_branch_name, new_tenant_id, new_timeline_id)
+    env.neon_cli.mappings_map_branch(branch_name, new_tenant_id, new_timeline_id)
 
     # Get some timeline details for later.
     locations = env.storage_controller.locate(new_tenant_id)
@@ -173,7 +173,7 @@ def test_template_smoke(neon_env_builder: NeonEnvBuilder):
     # Last step: validation
 
     with env.endpoints.create_start(
-        branch_name=import_branch_name,
+        branch_name=branch_name,
         endpoint_id="ro",
         tenant_id=new_tenant_id,
         lsn=last_record_lsn,
@@ -182,15 +182,15 @@ def test_template_smoke(neon_env_builder: NeonEnvBuilder):
 
         # ensure the template survives restarts
         ro_endpoint.stop()
-        #env.pageserver.stop(immediate=True)
-        #env.pageserver.start()
+        env.pageserver.stop(immediate=True)
+        env.pageserver.start()
         ro_endpoint.start()
         validate_data_equivalence(ro_endpoint)
 
     #
     # validate that we can write
     #
-    workload = Workload(env, new_tenant_id, new_timeline_id, branch_name=import_branch_name)
+    workload = Workload(env, new_tenant_id, new_timeline_id, branch_name=branch_name)
     workload.init()
     workload.write_rows(64)
     workload.validate()