From 60cc197ce336284346e1b25c1f15c25e9918c908 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Fri, 26 May 2023 10:19:24 +0200 Subject: [PATCH] fix test_timeline_create_break_after_uninit_mark (the refactoring added .context()) --- pageserver/src/tenant.rs | 1 + test_runner/regress/test_broken_timeline.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs index e2798d03a8..7e0c1242ca 100644 --- a/pageserver/src/tenant.rs +++ b/pageserver/src/tenant.rs @@ -2817,6 +2817,7 @@ impl Tenant { crashsafe::create_dir_all(timeline_path).context("Failed to create timeline directory")?; fail::fail_point!("after-timeline-uninit-mark-creation", |_| { + error!("hitting failpoint after-timeline-uninit-mark-creation"); anyhow::bail!("failpoint after-timeline-uninit-mark-creation"); }); diff --git a/test_runner/regress/test_broken_timeline.py b/test_runner/regress/test_broken_timeline.py index 0fb3b4f262..1ce9fd006f 100644 --- a/test_runner/regress/test_broken_timeline.py +++ b/test_runner/regress/test_broken_timeline.py @@ -172,8 +172,10 @@ def test_timeline_create_break_after_uninit_mark(neon_simple_env: NeonEnv): # Introduce failpoint when creating a new timeline uninit mark, before any other files were created pageserver_http.configure_failpoints(("after-timeline-uninit-mark-creation", "return")) - with pytest.raises(Exception, match="after-timeline-uninit-mark-creation"): + with pytest.raises(Exception, match="create timeline files"): _ = env.neon_cli.create_timeline("test_timeline_create_break_after_uninit_mark", tenant_id) + env.pageserver.allowed_errors.append(".*InternalServerError.*create timeline files") + env.pageserver.allowed_errors.append(".*hitting failpoint after-timeline-uninit-mark-creation") # Creating the timeline didn't finish. The other timelines on tenant should still be present and work normally. # "New" timeline is not present in the list, allowing pageserver to retry the same request