This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 892ceb56c47 HDDS-14632. TestDefault...ChoosingPolicy failing due to
cluster ID mismatch (#9761)
892ceb56c47 is described below
commit 892ceb56c47802c91954e943e33340de2a89691a
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Feb 16 15:46:18 2026 +0100
HDDS-14632. TestDefault...ChoosingPolicy failing due to cluster ID mismatch
(#9761)
---
.../container/diskbalancer/TestDefaultContainerChoosingPolicy.java | 3 +++
.../container/diskbalancer/TestDefaultVolumeChoosingPolicy.java | 5 ++---
.../ozone/container/upgrade/TestDatanodeUpgradeToSchemaV3.java | 4 +++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDefaultContainerChoosingPolicy.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDefaultContainerChoosingPolicy.java
index 726dad5555a..67fa7dac39e 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDefaultContainerChoosingPolicy.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDefaultContainerChoosingPolicy.java
@@ -17,6 +17,7 @@
package org.apache.hadoop.ozone.container.diskbalancer;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_DATANODE_DIR_KEY;
import static
org.apache.hadoop.ozone.container.common.impl.ContainerImplTestUtils.newContainerSet;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -106,6 +107,8 @@ private void setupVolumesAndContainer() throws IOException {
destVolume1 = createVolume("dest-volume1", 0.10);
destVolume2 = createVolume("dest-volume2", 0.50);
+ CONF.set(HDDS_DATANODE_DIR_KEY,
baseDir.resolve("defaultVolume").toString());
+
// Create and spy on the volume set
String datanodeUuid = UUID.randomUUID().toString();
volumeSet = spy(new MutableVolumeSet(datanodeUuid, CONF, null,
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDefaultVolumeChoosingPolicy.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDefaultVolumeChoosingPolicy.java
index 8a93a1005de..ff47a8281ec 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDefaultVolumeChoosingPolicy.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDefaultVolumeChoosingPolicy.java
@@ -17,6 +17,7 @@
package org.apache.hadoop.ozone.container.diskbalancer;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_DATANODE_DIR_KEY;
import static
org.apache.hadoop.ozone.container.diskbalancer.DiskBalancerVolumeCalculation.getVolumeUsages;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -233,11 +234,9 @@ private List<HddsVolume>
createVolumes(List<VolumeTestConfig> configs)
* @param volumes List of volumes to add to volume set
*/
private void setupVolumeSet(List<HddsVolume> volumes) throws IOException {
- // Create volume set without any default volumes from configuration
// Use a clean configuration to avoid loading default volumes
OzoneConfiguration testConf = new OzoneConfiguration();
- // Explicitly set HDDS_DATANODE_DIR_KEY to empty to prevent default volumes
- testConf.set("hdds.datanode.dir.key", "");
+ testConf.set(HDDS_DATANODE_DIR_KEY,
baseDir.resolve("defaultVolume").toString());
volumeSet = new MutableVolumeSet(datanodeUuid, testConf, null,
StorageVolume.VolumeType.DATA_VOLUME, null);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToSchemaV3.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToSchemaV3.java
index abee873cc8a..56b9945706f 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToSchemaV3.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToSchemaV3.java
@@ -94,8 +94,10 @@ private void initTests(Boolean enable) throws Exception {
private void setup() throws Exception {
address = SCMTestUtils.getReuseableAddress();
conf.setSocketAddr(ScmConfigKeys.OZONE_SCM_NAMES, address);
+ conf.set(ScmConfigKeys.HDDS_DATANODE_DIR_KEY,
+ tempFolder.resolve("data").toString());
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS,
- tempFolder.toString());
+ tempFolder.resolve("meta").toString());
}
@AfterEach
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
