From 6d3be4cf7dcc38c0c200e4ccd546a1326500e35e Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Thu, 11 May 2023 20:00:33 +0300 Subject: [PATCH] doc: review suggestions Co-authored-by: Christian Schwarz --- pageserver/src/tenant.rs | 2 +- test_runner/regress/test_timeline_delete.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs index 553e70c947..127a7cbfa2 100644 --- a/pageserver/src/tenant.rs +++ b/pageserver/src/tenant.rs @@ -1606,7 +1606,7 @@ impl Tenant { Ok(()) } - // execute in the *winners* span so we will capture the request id etc. + // execute in the *winner's* span so we will capture the request id etc. .instrument(span) }; diff --git a/test_runner/regress/test_timeline_delete.py b/test_runner/regress/test_timeline_delete.py index 9b92b077e0..06e38f585b 100644 --- a/test_runner/regress/test_timeline_delete.py +++ b/test_runner/regress/test_timeline_delete.py @@ -396,13 +396,14 @@ def test_concurrent_timeline_delete_if_first_stuck_at_index_upload( # release the pause ps_http.configure_failpoints((failpoint_name, "off")) - # both should had succeeded + # both should had succeeded: the second call will coalesce with the already-ongoing first call result = delete_results.get() assert result == "success" result = delete_results.get() assert result == "success" # the second call will try to transition the timeline into Stopping state, but it's already in that state + # (the transition to Stopping state is not part of the request coalescing, because Tenant and Timeline states are a mess already) env.pageserver.allowed_errors.append( f".*{child_timeline_id}.*Ignoring new state, equal to the existing one: Stopping" )