Use Azure Bulk Deletes in Azure Repository #53919
Merged
Conversation
This file contains 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
Upgrading to 8.6.2 in elastic#53865 broke running against HTTPs endpoints (and hence real azure) because the https url connection needs the newly added permission to work.
Now that we upgraded the Azure SDK to 8.6.2 we can make use of bulk deletes.
original-brownbear
added
>enhancement
:Distributed Coordination/Snapshot/Restore
|
Pinging @elastic/es-distributed (:Distributed/Snapshot/Restore) |
| @@ -80,15 +74,6 @@ AzureStorageService createAzureStoreService(final Settings settings) { | |||
| ); | |||
| } | |||
|
|
|||
| @Override | |||
| public List<ExecutorBuilder<?>> getExecutorBuilders(Settings settings) { | |||
There was a problem hiding this comment.
No need to deprecate here. We have never documented this threadpool and it was always seen as an internal setting.
Having it set will not prevent ES from starting up cleanly so I don't see anyone getting hurt here.
| @@ -67,18 +72,21 @@ public void handle(final HttpExchange exchange) throws IOException { | |||
| assert read == -1 : "Request body should have been empty but saw [" + read + "]"; | |||
| } | |||
| try { | |||
| // Request body is closed in the finally block | |||
| final BytesReference requestBody = Streams.readFully(Streams.noCloseStream(exchange.getRequestBody())); | |||
There was a problem hiding this comment.
Since we needed the request body again I refactored things like we did for the other mocks to full drain the input first thing here as well to keep things simple.
| @@ -20,4 +20,5 @@ | |||
| grant { | |||
| // azure client opens socket connections for to access repository | |||
| permission java.net.SocketPermission "*", "connect"; | |||
| permission java.lang.RuntimePermission "setFactory"; | |||
tlrx
approved these changes
Mar 23, 2020
| ++currentBatchSize; | ||
| } while (blobIterator.hasNext() && currentBatchSize < Constants.BATCH_MAX_REQUESTS); | ||
| currentBatchSize = 0; | ||
| logger.trace(() -> new ParameterizedMessage("delete blobs for container [{}], blob [{}]", container, blobs)); |
There was a problem hiding this comment.
In case of more than 256 blobs to delete, this will log the same message multiple times right?
There was a problem hiding this comment.
Right :) moved the log statement to the beginning of the method now
| @@ -64,7 +64,7 @@ protected Settings repositorySettings() { | |||
|
|
|||
| @Override | |||
| protected Map<String, HttpHandler> createHttpHandlers() { | |||
| return Collections.singletonMap("/container", new AzureBlobStoreHttpHandler("container")); | |||
| return Collections.singletonMap("/", new AzureBlobStoreHttpHandler("container")); | |||
There was a problem hiding this comment.
Batch request does not prefix with the container name, right?
There was a problem hiding this comment.
Jup exactly, that's why I had to expand the context here
| "Content-ID: " + contentId++ + " \r\n"); | ||
| if (blobs.remove(b) == null) { | ||
| writer.write("\r\nHTTP/1.1 404 The specified blob does not exist. \r\n" + | ||
| "x-ms-error-code: BlobNotFound \r\n" + |
ywelsch
approved these changes
Mar 23, 2020
|
Thanks Yannick + Tanguy! |
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Mar 23, 2020
Now that we upgraded the Azure SDK to 8.6.2 in elastic#53865 we can make use of bulk deletes.
original-brownbear
added a commit
that referenced
this pull request
Mar 23, 2020
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Mar 24, 2020
This reverts commit 23cccf0. Unfortunately SAS token auth still doesn't work with bulk deletes so we can't use them yet. Closes elastic#54080
original-brownbear
added a commit
that referenced
this pull request
Mar 24, 2020
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Mar 24, 2020
…lastic#54089) This reverts commit 23cccf0. Unfortunately SAS token auth still doesn't work with bulk deletes so we can't use them yet. Closes elastic#54080
original-brownbear
added a commit
that referenced
this pull request
Mar 25, 2020
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Mar 26, 2020
…lastic#54089) This reverts commit 23cccf0. Unfortunately SAS token auth still doesn't work with bulk deletes so we can't use them yet. Closes elastic#54080
original-brownbear
added a commit
that referenced
this pull request
Mar 26, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Now that we upgraded the Azure SDK in #53865 we can start using bulk deletes like we do with S3 and GCS.