Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(test_remote_storage_upload_queue_retries): became flakier since #6960 #6999

Merged
merged 2 commits into from
Mar 4, 2024
Merged

fix(test_remote_storage_upload_queue_retries): became flakier since #6960 #6999

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b89d33e
fix(test_remote_storage_upload_queue_retries): became flakier since #…
problame Mar 4, 2024
708a7a4
Merge branch 'main' into problame/deflake-test_remote_storage_upload_…
problame Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions test_runner/regress/test_remote_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,14 +329,15 @@ def churn_while_failpoints_active(result):
churn_while_failpoints_active_thread.start()

# wait for churn thread's data to get stuck in the upload queue
wait_until(10, 0.5, lambda: assert_gt(get_queued_count(file_kind="layer", op_kind="upload"), 0))
wait_until(10, 0.5, lambda: assert_ge(get_queued_count(file_kind="index", op_kind="upload"), 2))
wait_until(10, 0.5, lambda: assert_gt(get_queued_count(file_kind="layer", op_kind="delete"), 0))
# Exponential back-off in upload queue, so, gracious timeouts.

wait_until(30, 1, lambda: assert_gt(get_queued_count(file_kind="layer", op_kind="upload"), 0))
wait_until(30, 1, lambda: assert_ge(get_queued_count(file_kind="index", op_kind="upload"), 2))
wait_until(30, 1, lambda: assert_gt(get_queued_count(file_kind="layer", op_kind="delete"), 0))

# unblock churn operations
configure_storage_sync_failpoints("off")

# ... and wait for them to finish. Exponential back-off in upload queue, so, gracious timeouts.
wait_until(30, 1, lambda: assert_eq(get_queued_count(file_kind="layer", op_kind="upload"), 0))
wait_until(30, 1, lambda: assert_eq(get_queued_count(file_kind="index", op_kind="upload"), 0))
wait_until(30, 1, lambda: assert_eq(get_queued_count(file_kind="layer", op_kind="delete"), 0))
Expand Down