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 de9a41bf077b9542912393dc0d9aeeeda2fa75c3 Author: Bharat Viswanadham <[email protected]> AuthorDate: Wed Jun 17 14:45:51 2020 -0700 fix s3 mpu part --- .../s3/multipart/S3MultipartUploadCommitPartRequest.java | 6 ++++-- .../s3/multipart/S3MultipartUploadCommitPartResponse.java | 13 ++++++++----- 2 files changed, 12 insertions(+), 7 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 03c8ac2..346ff87 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 @@ -202,7 +202,8 @@ public class S3MultipartUploadCommitPartRequest extends OMKeyRequest { .setPartName(partName)); omClientResponse = new S3MultipartUploadCommitPartResponse( omResponse.build(), multipartKey, openKey, - multipartKeyInfo, oldPartKeyInfo, ozoneManager.isRatisEnabled()); + multipartKeyInfo, oldPartKeyInfo, omKeyInfo, + ozoneManager.isRatisEnabled()); result = Result.SUCCESS; } catch (IOException ex) { @@ -210,7 +211,8 @@ public class S3MultipartUploadCommitPartRequest extends OMKeyRequest { exception = ex; omClientResponse = new S3MultipartUploadCommitPartResponse( createErrorOMResponse(omResponse, exception), multipartKey, openKey, - multipartKeyInfo, oldPartKeyInfo, ozoneManager.isRatisEnabled()); + multipartKeyInfo, oldPartKeyInfo, omKeyInfo, + 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 9705e67..883ba57 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 @@ -41,6 +41,7 @@ import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .Status.OK; import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Response for S3MultipartUploadCommitPart request. @@ -69,14 +70,16 @@ public class S3MultipartUploadCommitPartResponse extends OMClientResponse { */ public S3MultipartUploadCommitPartResponse(@Nonnull OMResponse omResponse, String multipartKey, String openKey, - @Nonnull OmMultipartKeyInfo omMultipartKeyInfo, - @Nonnull OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo, + @Nullable OmMultipartKeyInfo omMultipartKeyInfo, + @Nullable OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo, + @Nullable OmKeyInfo openPartKeyInfoToBeDeleted, boolean isRatisEnabled) { super(omResponse); this.multipartKey = multipartKey; this.openKey = openKey; this.omMultipartKeyInfo = omMultipartKeyInfo; this.oldPartKeyInfo = oldPartKeyInfo; + this.openPartKeyInfoToBeDeleted = openPartKeyInfoToBeDeleted; this.isRatisEnabled = isRatisEnabled; } @@ -87,12 +90,12 @@ public class S3MultipartUploadCommitPartResponse extends OMClientResponse { if (getOMResponse().getStatus() == NO_SUCH_MULTIPART_UPLOAD_ERROR) { // Means by the time we try to commit part, some one has aborted this // multipart upload. So, delete this part information. + RepeatedOmKeyInfo repeatedOmKeyInfo = omMetadataManager.getDeletedTable().get(openKey); - repeatedOmKeyInfo = OmUtils.prepareKeyForDelete( - openPartKeyInfoToBeDeleted, repeatedOmKeyInfo, - openPartKeyInfoToBeDeleted.getUpdateID(), isRatisEnabled); + OmUtils.prepareKeyForDelete(openPartKeyInfoToBeDeleted, + repeatedOmKeyInfo, omMultipartKeyInfo.getUpdateID(), isRatisEnabled); omMetadataManager.getDeletedTable().putWithBatch(batchOperation, openKey, repeatedOmKeyInfo); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
