Repository navigation
Retry Swift container cleanup after stale listings - #1206
Open
2748109647 wants to merge 1 commit into
Open
2748109647 wants to merge 1 commit into
2748109647 wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #1202.
OpenStack Swift can acknowledge a write before its container listing reflects the object. The default
BlobStore.deleteContainerclears one listing pass and then deletes the container; if a late listing update lands between those steps, Swift returnsBucketNotEmptyand teardown fails.This adds a Swift-only override that retries the full clear-and-delete operation after
BucketNotEmpty, with six bounded attempts and exponential backoff (100 ms through 1.6 s; 3.1 s total wait). Other S3 errors are propagated immediately, and interruption restores the interrupt flag and propagates the conflict.Validation:
mvn -B -ntp clean '-Dtest=OpenStackSwiftContainerDeleteRetryTest,OpenStackSwiftBlobStoreTest' test— passed on Temurin 25.0.4.1; 5 tests passed, 0 failures/errors/skips.git diff --check— passed.The retry behavior is covered with unit tests plus the existing Swift BlobStore tests. This does not reproduce the SAIO eventual-listing race in a live Swift integration test.