From ce92638185082e100a5b696a827194859e81fe8a Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Fri, 6 Oct 2023 09:49:31 +0100 Subject: [PATCH] test_runner: allow race in test_tenant_delete_is_resumed_on_attach (#5478) ## Problem `test_tenant_delete_is_resumed_on_attach` is flaky ## Summary of changes - Allow race in `test_tenant_delete_is_resumed_on_attach` - Cleanup `allowed_errors` in the file a bit --- test_runner/regress/test_tenant_delete.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/test_runner/regress/test_tenant_delete.py b/test_runner/regress/test_tenant_delete.py index 3a56ca51a6..7a0b2694b8 100644 --- a/test_runner/regress/test_tenant_delete.py +++ b/test_runner/regress/test_tenant_delete.py @@ -45,14 +45,11 @@ def test_tenant_delete_smoke( [ # The deletion queue will complain when it encounters simulated S3 errors ".*deletion executor: DeleteObjects request failed.*", + # lucky race with stopping from flushing a layer we fail to schedule any uploads + ".*layer flush task.+: could not flush frozen layer: update_metadata_file", ] ) - # lucky race with stopping from flushing a layer we fail to schedule any uploads - env.pageserver.allowed_errors.append( - ".*layer flush task.+: could not flush frozen layer: update_metadata_file" - ) - ps_http = env.pageserver.http_client() # first try to delete non existing tenant @@ -194,11 +191,9 @@ def test_delete_tenant_exercise_crash_safety_failpoints( ) if simulate_failures: - env.pageserver.allowed_errors.extend( - [ - # The deletion queue will complain when it encounters simulated S3 errors - ".*deletion executor: DeleteObjects request failed.*", - ] + env.pageserver.allowed_errors.append( + # The deletion queue will complain when it encounters simulated S3 errors + ".*deletion executor: DeleteObjects request failed.*", ) ps_http = env.pageserver.http_client() @@ -293,6 +288,10 @@ def test_tenant_delete_is_resumed_on_attach( neon_env_builder.enable_pageserver_remote_storage(remote_storage_kind) env = neon_env_builder.init_start(initial_tenant_conf=MANY_SMALL_LAYERS_TENANT_CONFIG) + env.pageserver.allowed_errors.append( + # lucky race with stopping from flushing a layer we fail to schedule any uploads + ".*layer flush task.+: could not flush frozen layer: update_metadata_file" + ) tenant_id = env.initial_tenant