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

Treat 404 as empty register in AzureBlobStore #108900

Merged
merged 3 commits into from
May 22, 2024
Merged

Treat 404 as empty register in AzureBlobStore #108900

merged 3 commits into from
May 22, 2024

Conversation

DaveCTurner
Copy link
Contributor

Closes #108504

@DaveCTurner DaveCTurner added >bug :Distributed/Snapshot/Restore Anything directly related to the `_snapshot/*` APIs v8.14.1 v8.15.0 labels May 22, 2024
@DaveCTurner DaveCTurner requested review from tlrx and pxsalehi May 22, 2024 12:42
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-distributed (Team:Distributed)

@elasticsearchmachine elasticsearchmachine added the Team:Distributed Meta label for distributed team label May 22, 2024
@elasticsearchmachine
Copy link
Collaborator

Hi @DaveCTurner, I've created a changelog YAML for you.

@DaveCTurner
Copy link
Contributor Author

Somewhat surprised we hadn't noticed this before, but the stronger check in #107830 catches it now. This commit aligns the implementation with GCS:

elasticsearch/modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStore.java

Lines 638 to 641 in 1b84ea7

final var statusCode = serviceException.getCode();
if (statusCode == RestStatus.NOT_FOUND.getStatus()) {
return OptionalBytesReference.EMPTY;
}

and S3:

elasticsearch/modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java

Lines 907 to 911 in 5cf8049

if (e.getStatusCode() == 404) {
return OptionalBytesReference.EMPTY;
} else {
throw e;
}

@DaveCTurner DaveCTurner mentioned this pull request May 22, 2024
Merged
@DaveCTurner DaveCTurner added auto-merge Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) auto-backport-and-merge Automatically create backport pull requests and merge when ready labels May 22, 2024
henningandersen
henningandersen approved these changes May 22, 2024
View reviewed changes
Copy link
Contributor

@henningandersen henningandersen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

tlrx
tlrx approved these changes May 22, 2024
View reviewed changes
Copy link
Member

@tlrx tlrx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for fixing this so quickly

@elasticsearchmachine elasticsearchmachine merged commit aa542de into elastic:main May 22, 2024
15 checks passed
@DaveCTurner DaveCTurner deleted the 2024/05/22/AzureBlobStore-get-register-missing branch May 22, 2024 13:37
DaveCTurner added a commit to DaveCTurner/elasticsearch that referenced this pull request May 22, 2024
@DaveCTurner
Treat 404 as empty register in AzureBlobStore (elastic#108900)
3d2db56 
Closes elastic#108504
@DaveCTurner DaveCTurner mentioned this pull request May 22, 2024
Merged
@elasticsearchmachine
Copy link
Collaborator

💚 Backport successful

Status Branch Result
✅ 8.14

elasticsearchmachine pushed a commit that referenced this pull request May 23, 2024
@DaveCTurner
Treat 404 as empty register in AzureBlobStore (#108900) (#108905)
3d2ceb1 
Closes #108504
@DaveCTurner DaveCTurner restored the 2024/05/22/AzureBlobStore-get-register-missing branch June 17, 2024 06:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tlrx tlrx tlrx approved these changes

@idegtiarenko idegtiarenko idegtiarenko approved these changes

@henningandersen henningandersen henningandersen approved these changes

@pxsalehi pxsalehi Awaiting requested review from pxsalehi

Assignees
No one assigned
Labels
auto-backport-and-merge Automatically create backport pull requests and merge when ready auto-merge Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) >bug :Distributed/Snapshot/Restore Anything directly related to the `_snapshot/*` APIs Team:Distributed Meta label for distributed team v8.14.1 v8.15.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[CI] AzureSnapshotRepoTestKitIT testRepositoryAnalysis failing
5 participants
@DaveCTurner @elasticsearchmachine @tlrx @idegtiarenko @henningandersen