HDDS-12980. Add unit test framework for reconciliation. #8402
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aswinshakil
reviewed
May 7, 2025
Member
aswinshakil
left a comment
aswinshakil
left a comment
There was a problem hiding this comment.
Posting the intermediate review here. Still need to review tests and the KeyValueHandler reconciliation logic
...e/src/main/java/org/apache/hadoop/ozone/container/checksum/ContainerChecksumTreeManager.java
Outdated
Show resolved
Hide resolved
| + data.getContainerID(), ex); | ||
| } | ||
| // Set in-memory data checksum. | ||
| data.setDataChecksum(checksumInfo.getContainerMerkleTree().getDataChecksum()); |
Member
There was a problem hiding this comment.
Right now this is also being used by markBlockAsDeleted in case of failure in that code flow we also want set the checksum.
Contributor
Author
There was a problem hiding this comment.
I removed it from here because markBlocksAsDeleted does not affect the merkle tree and should not change the data checksum.
...vice/src/main/java/org/apache/hadoop/ozone/container/checksum/ContainerMerkleTreeWriter.java
Show resolved
Hide resolved
...vice/src/main/java/org/apache/hadoop/ozone/container/checksum/ContainerMerkleTreeWriter.java
Show resolved
Hide resolved
...vice/src/main/java/org/apache/hadoop/ozone/container/checksum/ContainerMerkleTreeWriter.java
Outdated
Show resolved
Hide resolved
...tainer-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
Show resolved
Hide resolved
...tainer-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
Show resolved
Hide resolved
aswinshakil
reviewed
May 8, 2025
Member
aswinshakil
left a comment
aswinshakil
left a comment
There was a problem hiding this comment.
Thanks for working on this @errose28. I have posted some comments here.
...tainer-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
Outdated
Show resolved
Hide resolved
...tainer-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
Outdated
Show resolved
Hide resolved
...tainer-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
Outdated
Show resolved
Hide resolved
...tainer-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
Outdated
Show resolved
Hide resolved
...vice/src/main/java/org/apache/hadoop/ozone/container/checksum/ContainerMerkleTreeWriter.java
Show resolved
Hide resolved
Contributor
Author
|
@aswinshakil All comments should be addressed in the latest commits. I just need to circle back for some checkstyle failures. |
aswinshakil
reviewed
May 9, 2025
Member
aswinshakil
left a comment
aswinshakil
left a comment
There was a problem hiding this comment.
Thanks for the patch @errose28. The changes look good to me. Let me trigger the CI.
aswinshakil
approved these changes
May 13, 2025
Member
aswinshakil
left a comment
aswinshakil
left a comment
There was a problem hiding this comment.
The test failures are not related to this change. LGTM+1
aswinshakil
merged commit a355664
into
apache:HDDS-10239-container-reconciliation
38 of 43 checks passed
Contributor
Author
|
Thanks for the review @aswinshakil. We can do a reverse merge of master into the feature branch to bring in #8443 which should resolve the test issues for future PRs. |
errose28
added a commit
to errose28/ozone
that referenced
this pull request
May 14, 2025
…anner-builds-mt * HDDS-10239-container-reconciliation: HDDS-12980. Add unit test framework for reconciliation. (apache#8402) hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/ContainerChecksumTreeManager.java hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/ContainerMerkleTreeWriter.java hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/checksum/ContainerMerkleTreeTestUtils.java hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/checksum/TestContainerMerkleTreeWriter.java hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestContainerReconciliationWithMockDatanodes.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/checksum/TestContainerCommandReconciliation.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Create a unit test framework that writes container data locally, and mocks an ozone client to operate directly on those containers. This will allow us to test multiple failure combinations across replicas using container scan and repair while running much faster than a miniozone integration test.
The major components of this change are:
TestKeyValueHandlerinto its own test class for unit testing scan and repair across replicas.As part of the review, it will be helpful to pull #7490, which also incorporates this change, and run the tests there where they will pass with the scanner changes. Inspect the new log messages to make sure that they help follow what reconciliation is doing in each of these situations. The 10 missing blocks + 5 corrupt chunks case is one of the most involved tests to inspect the output from.
What is the link to the Apache JIRA
HDDS-12980
How was this patch tested?
The tests depend on HDDS-10374/#7490 to run. For now the tests are ignored to split up the review of HDDS-10374/#7490. I have also pushed the test to that change and they are passing. Once this PR is merged we can start running the tests in HDDS-10374/#7490.