This is an automated email from the ASF dual-hosted git repository. bharat pushed a commit to branch HDDS-3685 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit d053388412ef3929948169439b360bbf2d341b7e Author: Bharat Viswanadham <[email protected]> AuthorDate: Tue Jun 16 18:08:51 2020 -0700 fix mpu commitpart --- .../S3MultipartUploadCommitPartRequest.java | 4 ++-- .../S3MultipartUploadCommitPartResponse.java | 28 ---------------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java index 5055f77..03c8ac2 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java @@ -209,8 +209,8 @@ public class S3MultipartUploadCommitPartRequest extends OMKeyRequest { result = Result.FAILURE; exception = ex; omClientResponse = new S3MultipartUploadCommitPartResponse( - createErrorOMResponse(omResponse, exception), openKey, omKeyInfo, - ozoneManager.isRatisEnabled()); + createErrorOMResponse(omResponse, exception), multipartKey, openKey, + multipartKeyInfo, oldPartKeyInfo, ozoneManager.isRatisEnabled()); } finally { addResponseToDoubleBuffer(trxnLogIndex, omClientResponse, omDoubleBufferHelper); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java index 2e07faf..9705e67 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java @@ -80,34 +80,6 @@ public class S3MultipartUploadCommitPartResponse extends OMClientResponse { this.isRatisEnabled = isRatisEnabled; } - /** - * For the case when Multipart Upload does not exist (could have been - * aborted). - * 1. Put the partKeyInfo from openKeyTable into DeletedTable - * 2. Deleted openKey from OpenKeyTable - * @param omResponse - * @param openKey - * @param openPartKeyInfoToBeDeleted - */ - public S3MultipartUploadCommitPartResponse(@Nonnull OMResponse omResponse, - String openKey, @Nonnull OmKeyInfo openPartKeyInfoToBeDeleted, - boolean isRatisEnabled) { - super(omResponse); - checkStatusNotOK(); - this.openKey = openKey; - this.openPartKeyInfoToBeDeleted = openPartKeyInfoToBeDeleted; - this.isRatisEnabled = isRatisEnabled; - } - - /** - * For when the request is not successful. - * For a successful request, the other constructor should be used. - */ - public S3MultipartUploadCommitPartResponse(@Nonnull OMResponse omResponse) { - super(omResponse); - checkStatusNotOK(); - } - @Override public void checkAndUpdateDB(OMMetadataManager omMetadataManager, BatchOperation batchOperation) throws IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
