diff --git a/pageserver/src/walingest.rs b/pageserver/src/walingest.rs index 1c08d49d8b..ae2386ba12 100644 --- a/pageserver/src/walingest.rs +++ b/pageserver/src/walingest.rs @@ -463,7 +463,7 @@ impl WalIngest { // we could peek into the message and only pause if it contains // a particular string, for example, but this is enough for now. failpoint_support::sleep_millis_async!( - "wal-ingest-logical-message-sleep" + "pagserver-wal-ingest-logical-message-sleep" ); } } diff --git a/test_runner/regress/test_tenant_relocation.py b/test_runner/regress/test_tenant_relocation.py index 5561a128b7..45df904e1b 100644 --- a/test_runner/regress/test_tenant_relocation.py +++ b/test_runner/regress/test_tenant_relocation.py @@ -435,7 +435,7 @@ def test_emergency_relocate_with_branches_slow_replay( # This fail point will pause the WAL ingestion on the main branch, after the # the first insert - pageserver_http.configure_failpoints([("wal-ingest-logical-message-sleep", "return(5000)")]) + pageserver_http.configure_failpoints([("pageserver-wal-ingest-logical-message-sleep", "return(5000)")]) # Attach and wait a few seconds to give it time to load the tenants, attach to the # safekeepers, and to stream and ingest the WAL up to the pause-point. @@ -453,11 +453,11 @@ def test_emergency_relocate_with_branches_slow_replay( assert cur.fetchall() == [("before pause",), ("after pause",)] # Sanity check that the failpoint was reached - env.pageserver.assert_log_contains('failpoint "wal-ingest-logical-message-sleep": sleep done') + env.pageserver.assert_log_contains('failpoint "pageserver-wal-ingest-logical-message-sleep": sleep done') assert time.time() - before_attach_time > 5 # Clean up - pageserver_http.configure_failpoints(("wal-ingest-logical-message-sleep", "off")) + pageserver_http.configure_failpoints(("pageserver-wal-ingest-logical-message-sleep", "off")) # Simulate hard crash of pageserver and re-attach a tenant with a branch @@ -581,7 +581,7 @@ def test_emergency_relocate_with_branches_createdb( # bug reproduced easily even without this, as there is always some delay between # loading the timeline and establishing the connection to the safekeeper to stream and # ingest the WAL, but let's make this less dependent on accidental timing. - pageserver_http.configure_failpoints([("wal-ingest-logical-message-sleep", "return(5000)")]) + pageserver_http.configure_failpoints([("pageserver-wal-ingest-logical-message-sleep", "return(5000)")]) before_attach_time = time.time() env.pageserver.tenant_attach(tenant_id) @@ -590,8 +590,8 @@ def test_emergency_relocate_with_branches_createdb( assert query_scalar(cur, "SELECT count(*) FROM test_migrate_one") == 200 # Sanity check that the failpoint was reached - env.pageserver.assert_log_contains('failpoint "wal-ingest-logical-message-sleep": sleep done') + env.pageserver.assert_log_contains('failpoint "pageserver-wal-ingest-logical-message-sleep": sleep done') assert time.time() - before_attach_time > 5 # Clean up - pageserver_http.configure_failpoints(("wal-ingest-logical-message-sleep", "off")) + pageserver_http.configure_failpoints(("pageserver-wal-ingest-logical-message-sleep", "off"))