From c8c375b5654cdf842379e1f0e5cc82c03174d7cb Mon Sep 17 00:00:00 2001
From: John Spray <john@neon.tech>
Date: Tue, 17 Oct 2023 17:19:31 +0100
Subject: [PATCH] tests: update failpoint for restart test

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

diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs
index bb5a4525b6..b1c1114a3e 100644
--- a/pageserver/src/tenant.rs
+++ b/pageserver/src/tenant.rs
@@ -733,6 +733,8 @@ impl Tenant {
     ) -> anyhow::Result<()> {
         span::debug_assert_current_span_has_tenant_id();
 
+        crate::failpoint_support::sleep_millis_async!("before-attaching-tenant");
+
         let remote_storage = match &self.remote_storage {
             Some(rs) => rs,
             None => {
@@ -1160,8 +1162,6 @@ impl Tenant {
         // FIXME original collect_timeline_files contained one more check:
         //    1. "Timeline has no ancestor and no layer files"
 
-        crate::failpoint_support::sleep_millis_async!("before-loading-tenant");
-
         // Process loadable timelines first
         for (timeline_id, local_metadata) in scan.sorted_timelines_to_load {
             if let Err(e) = self
diff --git a/test_runner/regress/test_pageserver_restart.py b/test_runner/regress/test_pageserver_restart.py
index c0944edff5..4c51155236 100644
--- a/test_runner/regress/test_pageserver_restart.py
+++ b/test_runner/regress/test_pageserver_restart.py
@@ -62,7 +62,7 @@ def test_pageserver_restart(neon_env_builder: NeonEnvBuilder, generations: bool)
     tenant_load_delay_ms = 5000
     env.pageserver.stop()
     env.pageserver.start(
-        extra_env_vars={"FAILPOINTS": f"before-loading-tenant=return({tenant_load_delay_ms})"}
+        extra_env_vars={"FAILPOINTS": f"before-attaching-tenant=return({tenant_load_delay_ms})"}
     )
 
     # Check that it's in Attaching state