Skip to content

HDDS-12803. OmKeyInfo#isKeyInfoSame should handle object tags #8259

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
ivandika3 merged 1 commit into from
Apr 15, 2025
Merged

HDDS-12803. OmKeyInfo#isKeyInfoSame should handle object tags #8259

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
1 change: 1 addition & 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 @@ -818,6 +818,7 @@ public boolean isKeyInfoSame(OmKeyInfo omKeyInfo, boolean checkPath,
replicationConfig.equals(omKeyInfo.replicationConfig) &&
Objects.equals(getMetadata(), omKeyInfo.getMetadata()) &&
Objects.equals(acls, omKeyInfo.acls) &&
Objects.equals(getTags(), omKeyInfo.getTags()) &&
getObjectID() == omKeyInfo.getObjectID();

if (isEqual && checkUpdateID) {
Expand Down
9 changes: 9 additions & 0 deletions hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmKeyInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ private OmKeyInfo createOmKeyInfo(ReplicationConfig replicationConfig) {
.setReplicationConfig(replicationConfig)
.addMetadata("key1", "value1")
.addMetadata("key2", "value2")
.addTag("tagKey1", "tagValue1")
.addTag("tagKey2", "tagValue2")
.setExpectedDataGeneration(5678L)
.build();
}
Expand All @@ -149,6 +151,8 @@ private void createdAndTest(boolean isMPU) {
RatisReplicationConfig.getInstance(ReplicationFactor.THREE))
.addMetadata("key1", "value1")
.addMetadata("key2", "value2")
.addTag("tagKey1", "tagValue1")
.addTag("tagKey2", "tagValue2")
.setOmKeyLocationInfos(
Collections.singletonList(createOmKeyLocationInfoGroup(isMPU)))
.build();
Expand Down Expand Up @@ -194,6 +198,11 @@ private void createdAndTest(boolean isMPU) {
cloneKey = key.copyObject();

assertEquals(key.getAcls(), cloneKey.getAcls());

// Change object tags and check
key.setTags(Collections.singletonMap("tagKey3", "tagValue3"));

assertNotEquals(key, cloneKey);
}


Expand Down