Skip to content

HDDS-10594. File encryption info is not properly set when overwrite a file #6445

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
adoroszlai merged 1 commit into from
Mar 28, 2024
Merged

HDDS-10594. File encryption info is not properly set when overwrite a file #6445

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
12 changes: 11 additions & 1 deletion ...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 @@ -284,6 +284,17 @@ static void createAndVerifyKeyData(OzoneBucket bucket) throws Exception {
out.write(value.getBytes(StandardCharsets.UTF_8));
}
verifyKeyData(bucket, keyName, value, testStartTime);
OzoneKeyDetails key1 = bucket.getKey(keyName);

// Overwrite the key
try (OzoneOutputStream out = bucket.createKey(keyName,
value.getBytes(StandardCharsets.UTF_8).length,
ReplicationConfig.fromTypeAndFactor(RATIS, ONE),
new HashMap<>())) {
out.write(value.getBytes(StandardCharsets.UTF_8));
}
OzoneKeyDetails key2 = bucket.getKey(keyName);
assertNotEquals(key1.getFileEncryptionInfo().toString(), key2.getFileEncryptionInfo().toString());
}

static void createAndVerifyFileSystemData(
Expand Down Expand Up @@ -325,7 +336,6 @@ static void verifyKeyData(OzoneBucket bucket, String keyName, String value,
len = is.read(fileContent);
}


assertEquals(len, value.length());
assertTrue(verifyRatisReplication(bucket.getVolumeName(),
bucket.getName(), keyName, RATIS,
Expand Down
2 changes: 2 additions & 0 deletions ...zone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,8 @@ protected OmKeyInfo prepareFileInfo(
dbKeyInfo.getMetadata().clear();
dbKeyInfo.getMetadata().putAll(KeyValueUtil.getFromProtobuf(
keyArgs.getMetadataList()));

dbKeyInfo.setFileEncryptionInfo(encInfo);
return dbKeyInfo;
}

Expand Down