Skip to content

HDDS-6676. KeyValueContainerData#getProtoBufMessage() should set block count #3371

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 4 commits into from
Jun 30, 2022
Merged

HDDS-6676. KeyValueContainerData#getProtoBufMessage() should set block count #3371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b73de40
KeyValueContainerData#getProtoBufMessage() should set block count
kaijchen Apr 29, 2022
524ad26
Add testKeyValueDataProtoBufMsg
kaijchen May 12, 2022
8b1002e
Do not use reflection
kaijchen May 12, 2022
1f1206c
Merge branch 'apache:master' into HDDS-6676
kaijchen May 17, 2022
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 ...rvice/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ public ContainerDataProto getProtoBufMessage() {
builder.setContainerID(this.getContainerID());
builder.setContainerPath(this.getContainerPath());
builder.setState(this.getState());
builder.setBlockCount(this.getBlockCount());

for (Map.Entry<String, String> entry : getMetadata().entrySet()) {
ContainerProtos.KeyValue.Builder keyValBuilder =
Expand Down
27 changes: 27 additions & 0 deletions ...rvice/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,4 +596,31 @@ public void testDBProfileAffectsDBOptions() throws Exception {
Assert.assertNotEquals(outProfile1.getDBOptions().compactionReadaheadSize(),
outProfile2.getDBOptions().compactionReadaheadSize());
}

@Test
public void testKeyValueDataProtoBufMsg() throws Exception {
createContainer();
populate(10);
closeContainer();
ContainerProtos.ContainerDataProto proto =
keyValueContainerData.getProtoBufMessage();

assertEquals(keyValueContainerData.getContainerID(),
proto.getContainerID());
assertEquals(keyValueContainerData.getContainerType(),
proto.getContainerType());
assertEquals(keyValueContainerData.getContainerPath(),
proto.getContainerPath());
assertEquals(keyValueContainerData.getBlockCount(),
proto.getBlockCount());
assertEquals(keyValueContainerData.getBytesUsed(),
proto.getBytesUsed());
assertEquals(keyValueContainerData.getState(),
proto.getState());

for (ContainerProtos.KeyValue kv : proto.getMetadataList()) {
assertEquals(keyValueContainerData.getMetadata().get(kv.getKey()),
kv.getValue());
}
}
}