From 2c7b97245a95f2942c919fc1fa2cc5efe74f9cad Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 22 Aug 2023 13:34:12 +0100 Subject: [PATCH] tweak test_remote_storage_upload_queue_retries --- test_runner/regress/test_remote_storage.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test_runner/regress/test_remote_storage.py b/test_runner/regress/test_remote_storage.py index f1ffbaa235..d9eeda6b38 100644 --- a/test_runner/regress/test_remote_storage.py +++ b/test_runner/regress/test_remote_storage.py @@ -296,7 +296,8 @@ def test_remote_storage_upload_queue_retries( return int(executed) def assert_queued_count(file_kind: str, op_kind: str, fn): - v = get_queued_count(file_kind="layer", op_kind="upload") + v = get_queued_count(file_kind=file_kind, op_kind=op_kind) + log.info(f"queue count: {file_kind} {op_kind} {v}") assert fn(v) # Push some uploads into the remote_timeline_client queues, before failpoints @@ -364,7 +365,7 @@ def test_remote_storage_upload_queue_retries( # Deletions should have been enqueued now that index uploads proceeded log.info("Waiting to see deletions enqueued") - wait_until(5, 1, lambda: assert_deletion_queue(client, lambda v: v > 0)) + wait_until(10, 1, lambda: assert_deletion_queue(client, lambda v: v > 0)) # Run flush in the backgrorund because it will block on the failpoint class background_flush(threading.Thread):