Skip to content

HADOOP-14239. S3A Retry Multiple S3 Key Deletion #208

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

Closed
wants to merge 1 commit into from
Closed

HADOOP-14239. S3A Retry Multiple S3 Key Deletion #208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 19 additions & 2 deletions hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
import com.amazonaws.services.s3.model.SSECustomerKey;
import com.amazonaws.services.s3.model.UploadPartRequest;
import com.amazonaws.services.s3.model.UploadPartResult;
import com.amazonaws.services.s3.model.MultiObjectDeleteException;
import com.amazonaws.services.s3.model.MultiObjectDeleteException.DeleteError;
import com.amazonaws.services.s3.transfer.Copy;
import com.amazonaws.services.s3.transfer.TransferManager;
import com.amazonaws.services.s3.transfer.TransferManagerConfiguration;
Expand Down Expand Up @@ -1006,10 +1008,25 @@ private void blockRootDelete(String key) throws InvalidRequestException {
* operation statistics.
* @param deleteRequest keys to delete on the s3-backend
*/
private void deleteObjects(DeleteObjectsRequest deleteRequest) {
private void deleteObjects(DeleteObjectsRequest deleteRequest) throws InvalidRequestException {
incrementWriteOperations();
incrementStatistic(OBJECT_DELETE_REQUESTS, 1);
s3.deleteObjects(deleteRequest);
try {
s3.deleteObjects(deleteRequest);
} catch (MultiObjectDeleteException ex) {
List<DeleteObjectsRequest.KeyVersion> errorKeys = new ArrayList<>();
for (DeleteError deleteError : ex.getErrors()) {
errorKeys.add(new DeleteObjectsRequest.KeyVersion(deleteError.getKey()));
}
if (errorKeys.size() == deleteRequest.getKeys().size()) {
// fallback to single key deletion if all of them failed
for (DeleteObjectsRequest.KeyVersion keyVersion : errorKeys) {
deleteObject(keyVersion.getKey());
}
} else {
deleteObjects(deleteRequest.withKeys(errorKeys));
}
}
}

/**
Expand Down