Skip to content

HDDS-5980. [S3- TDE] Get on a key which is overwrite through MPU on a TDE bucket, the data does not match with uploaded data. #2844

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
bharatviswa504 merged 1 commit into from
Nov 17, 2021
Merged

HDDS-5980. [S3- TDE] Get on a key which is overwrite through MPU on a TDE bucket, the data does not match with uploaded data. #2844

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
8 changes: 8 additions & 0 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,14 @@ public void clearFileEncryptionInfo() {
this.encInfo = null;
}

/**
* Set the file encryption info.
* @param fileEncryptionInfo
*/
public void setFileEncryptionInfo(FileEncryptionInfo fileEncryptionInfo) {
this.encInfo = fileEncryptionInfo;
}

public String getPath() {
if (StringUtils.isBlank(getFileName())) {
return getKeyName();
Expand Down
11 changes: 11 additions & 0 deletions ...tion-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,17 @@ public void testMPUwithTwoParts() throws Exception {
testMultipartUploadWithEncryption(bucket, 2);
}

@Test
public void testMPUwithThreePartsOverride() throws Exception {
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();
OzoneBucket bucket = createVolumeAndBucket(volumeName, bucketName);
testMultipartUploadWithEncryption(bucket, 3);

// override the key and check content
testMultipartUploadWithEncryption(bucket, 3);
}


@Test
public void testMPUwithLinkBucket() throws Exception {
Expand Down
11 changes: 11 additions & 0 deletions ...ava/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,21 @@ protected OmKeyInfo getOmKeyInfo(OzoneManager ozoneManager, long trxnLogIndex,
updatePrefixFSOInfo(dbOpenKeyInfo, builder);
omKeyInfo = builder.build();
} else {
OmKeyInfo dbOpenKeyInfo = getOmKeyInfoFromOpenKeyTable(multipartOpenKey,
keyName, omMetadataManager);

// Already a version exists, so we should add it as a new version.
// But now as versioning is not supported, just following the commit
// key approach. When versioning support comes, then we can uncomment
// below code keyInfo.addNewVersion(locations);

// As right now versioning is not supported, we can set encryption info
// at KeyInfo level, but once we start supporting versioning,
// encryption info needs to be set at KeyLocation level, as each version
// will have it's own file encryption info.
if (dbOpenKeyInfo.getFileEncryptionInfo() != null) {
omKeyInfo.setFileEncryptionInfo(dbOpenKeyInfo.getFileEncryptionInfo());
}
omKeyInfo.updateLocationInfoList(partLocationInfos, true, true);
omKeyInfo.setModificationTime(keyArgs.getModificationTime());
omKeyInfo.setDataSize(dataSize);
Expand Down