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.

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

tests: mitigate bug to stabilize test_storage_controller_many_tenants #9771

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions test_runner/performance/test_storage_controller_scale.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
PageserverAvailability,
PageserverSchedulingPolicy,
)
from fixtures.pageserver.http import PageserverHttpClient
from fixtures.pageserver.http import PageserverApiException, PageserverHttpClient
from fixtures.pg_version import PgVersion


Expand Down Expand Up @@ -273,7 +273,17 @@ def exercise_timeline_ops(tenant_id, timeline_id):
archival_state = rng.choice(
[TimelineArchivalState.ARCHIVED, TimelineArchivalState.UNARCHIVED]
)
virtual_ps_http.timeline_archival_config(tenant_id, timeline_id, archival_state)
try:
virtual_ps_http.timeline_archival_config(tenant_id, timeline_id, archival_state)
except PageserverApiException as e:
if e.status_code == 404:
# FIXME: there is an edge case where timeline ops can encounter a 404 during
# a very short time window between generating a new generation number and
# attaching this tenant to its new pageserver.
# See https://github.com/neondatabase/neon/issues/9471
pass
else:
raise

# Generate a mixture of operations and dispatch them all concurrently
futs = []
Expand Down
Loading