This is an automated email from the ASF dual-hosted git repository.
erose pushed a change to branch HDDS-10239-container-reconciliation
in repository https://gitbox.apache.org/repos/asf/ozone.git
from 2cfd22a407 Merge branch 'master' into
HDDS-10239-container-reconciliation
add 31875f39ae HDDS-12079. Improve container merkle tree write handling
(#7694)
No new revisions were added by this update.
Summary of changes:
.../checksum/ContainerChecksumTreeManager.java | 6 +-
...kleTree.java => ContainerMerkleTreeWriter.java} | 76 ++++++++++++----------
.../container/keyvalue/KeyValueContainerCheck.java | 12 ++--
.../ozone/container/keyvalue/KeyValueHandler.java | 6 +-
.../ozone/container/ozoneimpl/DataScanResult.java | 14 ++--
.../checksum/ContainerMerkleTreeTestUtils.java | 24 +++----
.../checksum/TestContainerChecksumTreeManager.java | 34 +++++-----
...ree.java => TestContainerMerkleTreeWriter.java} | 40 ++++++------
.../ozone/container/common/ContainerTestUtils.java | 6 +-
.../container/ozoneimpl/TestDataScanResult.java | 5 +-
.../src/main/proto/DatanodeClientProtocol.proto | 4 +-
.../TestContainerCommandReconciliation.java | 6 +-
12 files changed, 122 insertions(+), 111 deletions(-)
rename
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/{ContainerMerkleTree.java
=> ContainerMerkleTreeWriter.java} (74%)
rename
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/checksum/{TestContainerMerkleTree.java
=> TestContainerMerkleTreeWriter.java} (87%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
