Skip to content

Fix exception handling in S3 compareAndExchangeRegister #138488

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

Merged
merged 4 commits into from
Nov 24, 2025
Merged

Fix exception handling in S3 compareAndExchangeRegister #138488

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69b288d
Fix exception handling in S3 `compareAndExchangeRegister`
DaveCTurner Nov 24, 2025
0c405c5
Add test
DaveCTurner Nov 24, 2025
4f599ba
Merge branch 'main' into 2025/11/24/s3-cas-exception-handling-2
DaveCTurner Nov 24, 2025
5cfcf3f
SuppressForbidden
DaveCTurner Nov 24, 2025
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
29 changes: 13 additions & 16 deletions modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,12 +810,12 @@ private class MultipartUploadCompareAndExchangeOperation {
this.threadPool = threadPool;
}

void run(BytesReference expected, BytesReference updated, ActionListener<OptionalBytesReference> listener) throws Exception {
innerRun(expected, updated, listener.delegateResponse((delegate, e) -> {
void run(BytesReference expected, BytesReference updated, ActionListener<OptionalBytesReference> listener) {
ActionListener.run(listener.delegateResponse((delegate, e) -> {
logger.trace(() -> Strings.format("[%s]: compareAndExchangeRegister failed", rawKey), e);
if (e instanceof AwsServiceException awsServiceException
&& (awsServiceException.statusCode() == 404
|| awsServiceException.statusCode() == 200
if ((e instanceof AwsServiceException awsServiceException)
&& (awsServiceException.statusCode() == RestStatus.NOT_FOUND.getStatus()
|| awsServiceException.statusCode() == RestStatus.OK.getStatus()
&& "NoSuchUpload".equals(awsServiceException.awsErrorDetails().errorCode()))) {
// An uncaught 404 means that our multipart upload was aborted by a concurrent operation before we could complete it.
// Also (rarely) S3 can start processing the request during a concurrent abort and this can result in a 200 OK with an
Expand All @@ -824,7 +824,7 @@ void run(BytesReference expected, BytesReference updated, ActionListener<Optiona
} else {
delegate.onFailure(e);
}
}));
}), l -> innerRun(expected, updated, l));
}

void innerRun(BytesReference expected, BytesReference updated, ActionListener<OptionalBytesReference> listener) throws Exception {
Expand Down Expand Up @@ -1120,16 +1120,13 @@ public void compareAndExchangeRegister(
ActionListener<OptionalBytesReference> listener
) {
final var clientReference = blobStore.clientReference();
ActionListener.run(
ActionListener.releaseBefore(clientReference, listener),
l -> new MultipartUploadCompareAndExchangeOperation(
purpose,
clientReference.client(),
blobStore.bucket(),
key,
blobStore.getThreadPool()
).run(expected, updated, l)
);
new MultipartUploadCompareAndExchangeOperation(
purpose,
clientReference.client(),
blobStore.bucket(),
key,
blobStore.getThreadPool()
).run(expected, updated, ActionListener.releaseBefore(clientReference, listener));
}

@Override
Expand Down