This is an automated email from the ASF dual-hosted git repository.
aswinshakil pushed a commit to branch HDDS-10239-container-reconciliation
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit e60f22745cc5bca7d3d46610984606916d509d2f
Merge: 3c4b3bec36 05567e6880
Author: Aswin Shakil Balasubramanian <aswin.shaki...@gmail.com>
AuthorDate: Mon Jun 23 22:08:43 2025 +0530
Merge branch 'master' of https://github.com/apache/ozone into
HDDS-10239-container-reconciliation
Commits: 9
05567e6880 HDDS-13317. Table should support empty array/String (#8676)
803fa3194e HDDS-13313. Bump maven-javadoc-plugin to 3.11.2 (#8672)
774b3ee78a HDDS-13315. Bump log4j2 to 2.25.0 (#8670)
b86fad8b9d HDDS-13316. Bump commons-text to 1.13.1 (#8669)
c043be77cf HDDS-13312. Bump maven-patch-plugin to 1.3 (#8673)
db6ed84df3 HDDS-13294. Remove the Table.close() method. (#8658)
e1365a79dc HDDS-13286. Fail stream write when the volume is full. (#8644)
af3a0f052a HDDS-13307. integration (flaky) fails with all tests passing
(#8667)
d207c18428 HDDS-13301. Fix TestSchemaOneBackwardsCompatibility (#8666)
Conflicts:
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java
.github/workflows/ci.yml | 4 +-
.../apache/hadoop/hdds/utils/db/Proto3Codec.java | 22 +-
.../ozone/container/common/helpers/BlockData.java | 6 +-
.../apache/hadoop/hdds/utils/db/CodecTestUtil.java | 29 +
.../container/common/helpers/ContainerUtils.java | 15 +
.../keyvalue/impl/KeyValueStreamDataChannel.java | 1 +
.../keyvalue/impl/StreamDataChannelBase.java | 5 +
.../ozone/container/metadata/DatanodeTable.java | 5 -
.../metadata/SchemaOneChunkInfoListCodec.java | 10 +-
.../TestSchemaOneBackwardsCompatibility.java | 3 +-
.../impl/TestKeyValueStreamDataChannel.java | 31 +
.../hdds/utils/db/RDBStoreByteArrayIterator.java | 6 +-
.../hdds/utils/db/RDBStoreCodecBufferIterator.java | 5 +-
.../org/apache/hadoop/hdds/utils/db/RDBTable.java | 5 -
.../org/apache/hadoop/hdds/utils/db/Table.java | 7 +-
.../apache/hadoop/hdds/utils/db/TypedTable.java | 24 +-
.../hadoop/hdds/utils/TestRDBSnapshotProvider.java | 18 +-
.../hadoop/hdds/utils/db/InMemoryTestTable.java | 4 -
.../hadoop/hdds/utils/db/TestDBStoreBuilder.java | 56 +-
.../apache/hadoop/hdds/utils/db/TestRDBStore.java | 158 +++--
.../hadoop/hdds/utils/db/TestRDBTableStore.java | 669 ++++++++++-----------
.../hdds/utils/db/TestTypedRDBTableStore.java | 321 +++++-----
.../hadoop/hdds/utils/db/TestTypedTable.java | 169 ++++--
.../hdds/scm/container/ContainerManager.java | 4 +-
.../hdds/scm/container/ContainerManagerImpl.java | 5 -
.../hdds/scm/container/ContainerStateManager.java | 5 -
.../scm/container/ContainerStateManagerImpl.java | 10 -
.../hdds/scm/pipeline/PipelineStateManager.java | 2 +-
.../scm/pipeline/PipelineStateManagerImpl.java | 10 +-
.../hdds/scm/server/StorageContainerManager.java | 1 -
.../upgrade/FinalizationStateManagerImpl.java | 1 -
.../scm/container/TestContainerManagerImpl.java | 4 -
.../scm/container/TestContainerReportHandler.java | 1 -
.../scm/container/TestContainerStateManager.java | 1 -
.../TestIncrementalContainerReportHandler.java | 1 -
.../scm/container/TestUnknownContainerReport.java | 18 -
.../hdds/scm/node/TestContainerPlacement.java | 1 -
hadoop-ozone/dev-support/checks/integration.sh | 3 +
hadoop-ozone/dev-support/checks/junit.sh | 1 -
.../hadoop/ozone/repair/om/TestFSORepairTool.java | 2 -
.../OzoneDelegationTokenSecretManager.java | 3 -
.../hadoop/ozone/security/OzoneSecretStore.java | 14 +-
.../hadoop/ozone/recon/api/BlocksEndPoint.java | 30 +-
.../scm/ReconStorageContainerManagerFacade.java | 1 -
.../scm/AbstractReconContainerManagerTest.java | 1 -
pom.xml | 8 +-
46 files changed, 829 insertions(+), 871 deletions(-)
diff --cc
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java
index d6f7817e28,c85f7cd906..f457ba5b2a
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java
@@@ -51,6 -56,8 +53,7 @@@ import org.apache.hadoop.ozone.OzoneCon
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.hadoop.ozone.container.common.impl.ContainerDataYaml;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
-import org.apache.hadoop.ozone.container.common.interfaces.Container;
+ import org.apache.hadoop.ozone.container.common.volume.HddsVolume;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ozone.apache.org
For additional commands, e-mail: commits-h...@ozone.apache.org
