-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Add support for async deletion in S3BlobContainer * Move helper methods to helper class * Minor refactor * Add UTs * Add more tests * Integrate async deletion in the snapshot interactions --------- Signed-off-by: Ashish Singh <[email protected]>
- Loading branch information
Showing
16 changed files
with
1,086 additions
and
6 deletions.
There are no files selected for viewing
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
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
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
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
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
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
95 changes: 95 additions & 0 deletions
95
...repository-s3/src/main/java/org/opensearch/repositories/s3/async/S3AsyncDeleteHelper.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.repositories.s3.async; | ||
|
|
||
| import software.amazon.awssdk.services.s3.S3AsyncClient; | ||
| import software.amazon.awssdk.services.s3.model.Delete; | ||
| import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest; | ||
| import software.amazon.awssdk.services.s3.model.DeleteObjectsResponse; | ||
| import software.amazon.awssdk.services.s3.model.ObjectIdentifier; | ||
|
|
||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.apache.logging.log4j.message.ParameterizedMessage; | ||
| import org.opensearch.repositories.s3.S3BlobStore; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class S3AsyncDeleteHelper { | ||
| private static final Logger logger = LogManager.getLogger(S3AsyncDeleteHelper.class); | ||
|
|
||
| public static CompletableFuture<Void> executeDeleteChain( | ||
| S3AsyncClient s3AsyncClient, | ||
| S3BlobStore blobStore, | ||
| List<String> objectsToDelete, | ||
| CompletableFuture<Void> currentChain, | ||
| Runnable afterDeleteAction | ||
| ) { | ||
| List<List<String>> batches = createDeleteBatches(objectsToDelete, blobStore.getBulkDeletesSize()); | ||
| CompletableFuture<Void> newChain = currentChain.thenCompose(v -> executeDeleteBatches(s3AsyncClient, blobStore, batches)); | ||
| if (afterDeleteAction != null) { | ||
| newChain = newChain.thenRun(afterDeleteAction); | ||
| } | ||
| return newChain; | ||
| } | ||
|
|
||
| static List<List<String>> createDeleteBatches(List<String> keys, int bulkDeleteSize) { | ||
| List<List<String>> batches = new ArrayList<>(); | ||
| for (int i = 0; i < keys.size(); i += bulkDeleteSize) { | ||
| batches.add(keys.subList(i, Math.min(keys.size(), i + bulkDeleteSize))); | ||
| } | ||
| return batches; | ||
| } | ||
|
|
||
| static CompletableFuture<Void> executeDeleteBatches(S3AsyncClient s3AsyncClient, S3BlobStore blobStore, List<List<String>> batches) { | ||
| CompletableFuture<Void> allDeletesFuture = CompletableFuture.completedFuture(null); | ||
|
|
||
| for (List<String> batch : batches) { | ||
| allDeletesFuture = allDeletesFuture.thenCompose(v -> executeSingleDeleteBatch(s3AsyncClient, blobStore, batch)); | ||
| } | ||
|
|
||
| return allDeletesFuture; | ||
| } | ||
|
|
||
| static CompletableFuture<Void> executeSingleDeleteBatch(S3AsyncClient s3AsyncClient, S3BlobStore blobStore, List<String> batch) { | ||
| DeleteObjectsRequest deleteRequest = bulkDelete(blobStore.bucket(), batch, blobStore); | ||
| return s3AsyncClient.deleteObjects(deleteRequest).thenApply(S3AsyncDeleteHelper::processDeleteResponse); | ||
| } | ||
|
|
||
| static Void processDeleteResponse(DeleteObjectsResponse deleteObjectsResponse) { | ||
| if (!deleteObjectsResponse.errors().isEmpty()) { | ||
| logger.warn( | ||
| () -> new ParameterizedMessage( | ||
| "Failed to delete some blobs {}", | ||
| deleteObjectsResponse.errors() | ||
| .stream() | ||
| .map(s3Error -> "[" + s3Error.key() + "][" + s3Error.code() + "][" + s3Error.message() + "]") | ||
| .collect(Collectors.toList()) | ||
| ) | ||
| ); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| static DeleteObjectsRequest bulkDelete(String bucket, List<String> blobs, S3BlobStore blobStore) { | ||
| return DeleteObjectsRequest.builder() | ||
| .bucket(bucket) | ||
| .delete( | ||
| Delete.builder() | ||
| .objects(blobs.stream().map(blob -> ObjectIdentifier.builder().key(blob).build()).collect(Collectors.toList())) | ||
| .quiet(true) | ||
| .build() | ||
| ) | ||
| .overrideConfiguration(o -> o.addMetricPublisher(blobStore.getStatsMetricPublisher().getDeleteObjectsMetricPublisher())) | ||
| .build(); | ||
| } | ||
| } |
Oops, something went wrong.