Skip to content

Batch delete requests for exchange spooling on S3 and Azure #12511

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
arhimondr merged 3 commits into from
May 31, 2022
Merged

Batch delete requests for exchange spooling on S3 and Azure #12511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77b3f51
Batch delete requests for exchange spooling on S3
linzebing May 22, 2022
33f5d06
Batch delete requests for exchange spooling on Azure
linzebing May 23, 2022
f9aa07a
Translate failures for exchange spooling on Azure
linzebing May 23, 2022
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
41 changes: 41 additions & 0 deletions ...lesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeFutures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
Copy link
Copy Markdown
Member

@losipiuk losipiuk May 27, 2022

Choose a reason for hiding this comment

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

commit message typo sppoling

* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.trino.plugin.exchange.filesystem;

import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;

import java.io.IOException;

import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static io.airlift.concurrent.MoreFutures.asVoid;

public final class FileSystemExchangeFutures
{
private FileSystemExchangeFutures() {}

// Helper function that translates exception and transform future type to avoid abstraction leak
public static ListenableFuture<Void> translateFailures(ListenableFuture<?> listenableFuture)
{
return asVoid(Futures.catchingAsync(listenableFuture, Throwable.class, throwable -> {
if (throwable instanceof Error || throwable instanceof IOException) {
return immediateFailedFuture(throwable);
}
else {
return immediateFailedFuture(new IOException(throwable));
}
}, directExecutor()));
}
}
67 changes: 42 additions & 25 deletions ...in/java/io/trino/plugin/exchange/filesystem/azure/AzureBlobFileSystemExchangeStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
import com.azure.storage.blob.models.ListBlobsOptions;
import com.azure.storage.blob.specialized.BlockBlobAsyncClient;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.util.concurrent.FluentFuture;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
Expand Down Expand Up @@ -77,6 +80,7 @@
import static io.airlift.concurrent.MoreFutures.getFutureValue;
import static io.airlift.concurrent.MoreFutures.toListenableFuture;
import static io.airlift.slice.SizeOf.estimatedSizeOf;
import static io.trino.plugin.exchange.filesystem.FileSystemExchangeFutures.translateFailures;
import static io.trino.plugin.exchange.filesystem.FileSystemExchangeManager.PATH_SEPARATOR;
import static java.lang.Math.min;
import static java.lang.Math.toIntExact;
Expand Down Expand Up @@ -150,7 +154,7 @@ public ListenableFuture<Void> createEmptyFile(URI file)
{
String containerName = getContainerName(file);
String blobName = getPath(file);
return asVoid(toListenableFuture(blobServiceAsyncClient
return translateFailures(toListenableFuture(blobServiceAsyncClient
.getBlobContainerAsyncClient(containerName)
.getBlobAsyncClient(blobName)
.upload(BinaryData.fromString(""))
Expand All @@ -160,12 +164,32 @@ public ListenableFuture<Void> createEmptyFile(URI file)
@Override
public ListenableFuture<Void> deleteRecursively(List<URI> directories)
{
return asVoid(Futures.allAsList(directories.stream()
.map(dir -> Futures.transformAsync(
toListenableFuture(listObjectsRecursively(dir).byPage().collectList().toFuture()),
pagedResponseList -> deleteObjects(getContainerName(dir), pagedResponseList),
directExecutor()))
.collect(toImmutableList())));
ImmutableMultimap.Builder<String, ListenableFuture<List<PagedResponse<BlobItem>>>> containerToListObjectsFuturesBuilder = ImmutableMultimap.builder();
directories.forEach(dir -> containerToListObjectsFuturesBuilder.put(
getContainerName(dir),
toListenableFuture(listObjectsRecursively(dir).byPage().collectList().toFuture())));
Multimap<String, ListenableFuture<List<PagedResponse<BlobItem>>>> containerToListObjectsFutures = containerToListObjectsFuturesBuilder.build();

ImmutableList.Builder<ListenableFuture<List<Void>>> deleteObjectsFutures = ImmutableList.builder();
for (String containerName : containerToListObjectsFutures.keySet()) {
BlobContainerClient blobContainerClient = blobServiceClient.getBlobContainerClient(containerName);
deleteObjectsFutures.add(Futures.transformAsync(
Futures.allAsList(containerToListObjectsFutures.get(containerName)),
nestedPagedResponseList -> {
ImmutableList.Builder<String> blobUrls = ImmutableList.builder();
for (List<PagedResponse<BlobItem>> pagedResponseList : nestedPagedResponseList) {
for (PagedResponse<BlobItem> pagedResponse : pagedResponseList) {
pagedResponse.getValue().forEach(blobItem -> {
blobUrls.add(blobContainerClient.getBlobClient(blobItem.getName()).getBlobUrl());
});
}
}
return deleteObjects(blobUrls.build());
},
directExecutor()));
}

return translateFailures(Futures.allAsList(deleteObjectsFutures.build()));
}

@Override
Expand Down Expand Up @@ -241,23 +265,16 @@ private PagedFlux<BlobItem> listObjectsRecursively(URI dir)

return blobServiceAsyncClient
.getBlobContainerAsyncClient(containerName)
// deleteBlobs can delete at most 256 blobs at a time
.listBlobsByHierarchy(null, (new ListBlobsOptions()).setPrefix(directoryPath).setMaxResultsPerPage(256));
.listBlobsByHierarchy(null, (new ListBlobsOptions()).setPrefix(directoryPath));
}

private ListenableFuture<List<Void>> deleteObjects(String containerName, List<PagedResponse<BlobItem>> pageBlobItems)
private ListenableFuture<List<Void>> deleteObjects(List<String> blobUrls)
{
BlobBatchAsyncClient blobBatchAsyncClient = new BlobBatchClientBuilder(blobServiceClient).buildAsyncClient();
BlobContainerClient blobContainerClient = blobServiceClient.getBlobContainerClient(containerName);

return Futures.allAsList(pageBlobItems.stream().map(pageBlobItem -> {
if (pageBlobItem.getValue().isEmpty()) {
return immediateVoidFuture();
}
ImmutableList.Builder<String> builder = ImmutableList.builder();
pageBlobItem.getValue().forEach(blobItem -> builder.add(blobContainerClient.getBlobClient(blobItem.getName()).getBlobUrl()));
return toListenableFuture(blobBatchAsyncClient.deleteBlobs(builder.build(), DeleteSnapshotsOptionType.INCLUDE).then().toFuture());
}).collect(toImmutableList()));
// deleteBlobs can delete at most 256 blobs at a time
return Futures.allAsList(Lists.partition(blobUrls, 256).stream()
.map(list -> toListenableFuture(blobBatchAsyncClient.deleteBlobs(list, DeleteSnapshotsOptionType.INCLUDE).then().toFuture()))
.collect(toImmutableList()));
}

// URI format: abfs[s]://<container_name>@<account_name>.dfs.core.windows.net/<path>/<file_name>
Expand Down Expand Up @@ -505,15 +522,15 @@ public ListenableFuture<Void> write(Slice slice)

// Skip multipart upload if there would only be one part
if (slice.length() < blockSize && multiPartUploadFutures.isEmpty()) {
directUploadFuture = asVoid(toListenableFuture(blockBlobAsyncClient.upload(Flux.just(slice.toByteBuffer()), slice.length()).toFuture()));
directUploadFuture = translateFailures(toListenableFuture(blockBlobAsyncClient.upload(Flux.just(slice.toByteBuffer()), slice.length()).toFuture()));
return directUploadFuture;
}

String blockId = Base64.getEncoder().encodeToString(UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8));
ListenableFuture<Void> uploadFuture = toListenableFuture(blockBlobAsyncClient.stageBlock(blockId, Flux.just(slice.toByteBuffer()), slice.length()).toFuture());
multiPartUploadFutures.add(uploadFuture);
blockIds.add(blockId);
return uploadFuture;
return translateFailures(uploadFuture);
}

@Override
Expand All @@ -527,10 +544,10 @@ public ListenableFuture<Void> finish()
return requireNonNullElseGet(directUploadFuture, Futures::immediateVoidFuture);
}

ListenableFuture<Void> finishFuture = Futures.transformAsync(
ListenableFuture<Void> finishFuture = translateFailures(Futures.transformAsync(
Futures.allAsList(multiPartUploadFutures),
ignored -> asVoid(toListenableFuture(blockBlobAsyncClient.commitBlockList(blockIds).toFuture())),
directExecutor());
ignored -> toListenableFuture(blockBlobAsyncClient.commitBlockList(blockIds).toFuture()),
directExecutor()));
Futures.addCallback(finishFuture, new FutureCallback<>() {
@Override
public void onSuccess(Void result)
Expand Down
58 changes: 33 additions & 25 deletions ...tem/src/main/java/io/trino/plugin/exchange/filesystem/s3/S3FileSystemExchangeStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
import com.google.cloud.storage.StorageBatch;
import com.google.cloud.storage.StorageOptions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.io.Closer;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
Expand Down Expand Up @@ -89,6 +91,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.Queue;
Expand All @@ -100,14 +103,14 @@
import static com.google.common.base.Strings.nullToEmpty;
import static com.google.common.base.Verify.verify;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator;
import static io.airlift.concurrent.MoreFutures.asVoid;
import static io.airlift.concurrent.MoreFutures.getFutureValue;
import static io.airlift.concurrent.MoreFutures.toListenableFuture;
import static io.airlift.concurrent.Threads.threadsNamed;
import static io.trino.plugin.exchange.filesystem.FileSystemExchangeFutures.translateFailures;
import static io.trino.plugin.exchange.filesystem.FileSystemExchangeManager.PATH_SEPARATOR;
import static io.trino.plugin.exchange.filesystem.s3.S3FileSystemExchangeStorage.CompatibilityMode.GCP;
import static io.trino.plugin.exchange.filesystem.s3.S3RequestUtil.configureEncryption;
Expand Down Expand Up @@ -232,7 +235,7 @@ public ListenableFuture<Void> createEmptyFile(URI file)
.key(keyFromUri(file))
.build();

return stats.getCreateEmptyFile().record(transformFuture(toListenableFuture(s3AsyncClient.putObject(request, AsyncRequestBody.empty()))));
return stats.getCreateEmptyFile().record(translateFailures(toListenableFuture(s3AsyncClient.putObject(request, AsyncRequestBody.empty()))));
}

@Override
Expand All @@ -254,14 +257,32 @@ public ListenableFuture<Void> deleteRecursively(List<URI> directories)
})));
}
else {
return stats.getDeleteRecursively().record(asVoid(Futures.allAsList(directories.stream().map(dir -> {
ImmutableMultimap.Builder<String, ListenableFuture<List<String>>> bucketToListObjectsFuturesBuilder = ImmutableMultimap.builder();
for (URI dir : directories) {
ImmutableList.Builder<String> keys = ImmutableList.builder();
return transformFuture(Futures.transformAsync(
toListenableFuture((listObjectsRecursively(dir).subscribe(listObjectsV2Response ->
listObjectsV2Response.contents().stream().map(S3Object::key).forEach(keys::add)))),
ignored -> deleteObjects(getBucketName(dir), keys.build()),
ListenableFuture<List<String>> listObjectsFuture = Futures.transform(
toListenableFuture((listObjectsRecursively(dir)
.subscribe(listObjectsV2Response -> listObjectsV2Response.contents().stream()
.map(S3Object::key)
.forEach(keys::add)))),
ignored -> keys.build(),
directExecutor());
bucketToListObjectsFuturesBuilder.put(getBucketName(dir), listObjectsFuture);
}
Multimap<String, ListenableFuture<List<String>>> bucketToListObjectsFutures = bucketToListObjectsFuturesBuilder.build();

ImmutableList.Builder<ListenableFuture<List<DeleteObjectsResponse>>> deleteObjectsFutures = ImmutableList.builder();
for (String bucketName : bucketToListObjectsFutures.keySet()) {
deleteObjectsFutures.add(Futures.transformAsync(
Futures.allAsList(bucketToListObjectsFutures.get(bucketName)),
keys -> deleteObjects(
bucketName,
keys.stream()
.flatMap(Collection::stream)
.collect(toImmutableList())),
directExecutor()));
}).collect(toImmutableList()))));
}
return translateFailures(Futures.allAsList(deleteObjectsFutures.build()));
}
}

Expand Down Expand Up @@ -432,19 +453,6 @@ private static String keyFromUri(URI uri)
return key;
}

// Helper function that translates exception and transform future type to avoid abstraction leak
private static ListenableFuture<Void> transformFuture(ListenableFuture<?> listenableFuture)
{
return asVoid(Futures.catchingAsync(listenableFuture, Throwable.class, throwable -> {
if (throwable instanceof Error || throwable instanceof IOException) {
return immediateFailedFuture(throwable);
}
else {
return immediateFailedFuture(new IOException(throwable));
}
}, directExecutor()));
}

private static boolean isDirectory(URI uri)
{
return uri.toString().endsWith(PATH_SEPARATOR);
Expand Down Expand Up @@ -729,7 +737,7 @@ public ListenableFuture<Void> write(Slice slice)
.key(key)
.storageClass(storageClass);
configureEncryption(secretKey, putObjectRequestBuilder);
directUploadFuture = transformFuture(toListenableFuture(s3AsyncClient.putObject(putObjectRequestBuilder.build(),
directUploadFuture = translateFailures(toListenableFuture(s3AsyncClient.putObject(putObjectRequestBuilder.build(),
ByteBufferAsyncRequestBody.fromByteBuffer(slice.toByteBuffer()))));
stats.getPutObject().record(directUploadFuture);
stats.getPutObjectDataSizeInBytes().add(slice.length());
Expand All @@ -744,7 +752,7 @@ public ListenableFuture<Void> write(Slice slice)
ListenableFuture<CompletedPart> uploadFuture = Futures.transformAsync(multiPartUploadIdFuture, uploadId -> uploadPart(uploadId, slice, partNum), directExecutor());
multiPartUploadFutures.add(uploadFuture);

return transformFuture(uploadFuture);
return translateFailures(uploadFuture);
}

@Override
Expand All @@ -758,7 +766,7 @@ public ListenableFuture<Void> finish()
return requireNonNullElseGet(directUploadFuture, Futures::immediateVoidFuture);
}

ListenableFuture<Void> finishFuture = transformFuture(Futures.transformAsync(
ListenableFuture<Void> finishFuture = translateFailures(Futures.transformAsync(
Futures.allAsList(multiPartUploadFutures),
completedParts -> completeMultipartUpload(getFutureValue(multiPartUploadIdFuture), completedParts),
directExecutor()));
Expand Down Expand Up @@ -795,7 +803,7 @@ public ListenableFuture<Void> abort()

verify(directUploadFuture == null);
multiPartUploadFutures.forEach(future -> future.cancel(true));
return transformFuture(Futures.transformAsync(multiPartUploadIdFuture, this::abortMultipartUpload, directExecutor()));
return translateFailures(Futures.transformAsync(multiPartUploadIdFuture, this::abortMultipartUpload, directExecutor()));
}

@Override
Expand Down