Factor out common retrying logic #136663
+1,416
−644
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.repositories.azure; | ||
|
|
||
| import com.azure.core.exception.HttpResponseException; | ||
|
|
||
| import org.elasticsearch.ExceptionsHelper; | ||
| import org.elasticsearch.common.blobstore.OperationPurpose; | ||
| import org.elasticsearch.common.blobstore.RetryingInputStream; | ||
| import org.elasticsearch.core.Nullable; | ||
| import org.elasticsearch.repositories.blobstore.RequestedRangeNotSatisfiedException; | ||
| import org.elasticsearch.rest.RestStatus; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.NoSuchFileException; | ||
|
|
||
| public class AzureRetryingInputStream extends RetryingInputStream<String> { | ||
|
|
||
| protected AzureRetryingInputStream(AzureBlobStore azureBlobStore, OperationPurpose purpose, String blob, long position, Long length) | ||
| throws IOException { | ||
| super( | ||
| new AzureBlobStoreServices(azureBlobStore, purpose, blob), | ||
| purpose, | ||
| position, | ||
| length == null ? Long.MAX_VALUE - 1 : position + length | ||
| ); | ||
| } | ||
|
|
||
| private record AzureBlobStoreServices(AzureBlobStore blobStore, OperationPurpose purpose, String blob) | ||
| implements | ||
| RetryingInputStream.BlobStoreServices<String> { | ||
|
|
||
| @Override | ||
| public InputStreamAtVersion<String> getInputStreamAtVersion(@Nullable String version, long start, long end) throws IOException { | ||
| try { | ||
| final Long length = end < Long.MAX_VALUE - 1 ? end - start : null; | ||
| final AzureBlobStore.AzureInputStream inputStream = blobStore.getInputStream(purpose, blob, start, length, version); | ||
| return new InputStreamAtVersion<>(inputStream, inputStream.getETag()); | ||
| } catch (Exception e) { | ||
| if (ExceptionsHelper.unwrap(e, HttpResponseException.class) instanceof HttpResponseException httpResponseException) { | ||
| final var httpStatusCode = httpResponseException.getResponse().getStatusCode(); | ||
| if (httpStatusCode == RestStatus.NOT_FOUND.getStatus()) { | ||
| throw new NoSuchFileException("Blob [" + blob + "] not found"); | ||
| } | ||
| if (httpStatusCode == RestStatus.REQUESTED_RANGE_NOT_SATISFIED.getStatus()) { | ||
| throw new RequestedRangeNotSatisfiedException(blob, start, end == Long.MAX_VALUE - 1 ? -1 : end - start, e); | ||
| } | ||
| } | ||
| switch (e) { | ||
| case RuntimeException runtimeException -> throw runtimeException; | ||
| case IOException ioException -> throw ioException; | ||
| default -> throw new IOException("Unable to get input stream for blob [" + blob + "]", e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onRetryStarted(String action) { | ||
| // No metrics for Azure | ||
| } | ||
|
|
||
| @Override | ||
| public void onRetrySucceeded(String action, long numberOfRetries) { | ||
| // No metrics for Azure | ||
| } | ||
|
Contributor
Author
There was a problem hiding this comment. S3 has its own special metrics for these, we can probably make that consistent now, but I wonder if we want to do that in a separate PR to keep the volume down |
||
|
|
||
| @Override | ||
| public long getMeaningfulProgressSize() { | ||
| return Math.max(1L, blobStore.getReadChunkSize() / 100L); | ||
| } | ||
|
Contributor
Author
There was a problem hiding this comment. This value seems kind-of arbitrary. The Azure value calculates to about 320KiB, the GCS to 160KiB and the S3 one to 1MiB, they are all functions of various loosely-related thresholds. Perhaps it makes sense to make this a first-class setting and consistent across the CSPs? |
||
|
|
||
| @Override | ||
| public int getMaxRetries() { | ||
| return blobStore.getMaxReadRetries(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getBlobDescription() { | ||
| return blob; | ||
| } | ||
| } | ||
| } | ||
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We disable Azure client retries in these downloads so we can control them in the
RetryingInputStream