Skip to content

HDDS-6650. S3MultipartUpload support update bucket usedNamespace. #4081

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
aryangupta1998 merged 1 commit into from
Dec 19, 2022
Merged

HDDS-6650. S3MultipartUpload support update bucket usedNamespace. #4081

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions ...c/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,12 @@ public void testUploadPartOverrideWithRatis() throws IOException {
// comparing part names and large file uploads work using aws cp.
Assert.assertEquals("Part names should be same", partName,
commitUploadPartInfo.getPartName());

// old part bytes written needs discard and have only
// new part bytes in quota for this bucket
long byteWritten = "name".length() * 3; // data written with replication
Assert.assertEquals(volume.getBucket(bucketName).getUsedBytes(),
byteWritten);
}

@Test
Expand Down
8 changes: 6 additions & 2 deletions ...a/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,12 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
omBucketInfo = getBucketInfo(omMetadataManager, volumeName, bucketName);

long correctedSpace = omKeyInfo.getReplicatedSize();
// TODO: S3MultipartUpload did not check quota and did not add nameSpace,
// we need to fix these issues in HDDS-6650.
if (null != oldPartKeyInfo) {
OmKeyInfo partKeyToBeDeleted =
OmKeyInfo.getFromProtobuf(oldPartKeyInfo.getPartKeyInfo());
correctedSpace -= partKeyToBeDeleted.getReplicatedSize();
}
checkBucketQuotaInBytes(omBucketInfo, correctedSpace);
omBucketInfo.incrUsedBytes(correctedSpace);

omResponse.setCommitMultiPartUploadResponse(
Expand Down