You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2026/07/08 19:10:10 UTC
(ozone) branch master updated: HDDS-15754. Rename TestableCluster to MockCluster (#10691)
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 57c37c8f925 HDDS-15754. Rename TestableCluster to MockCluster (#10691)
57c37c8f925 is described below
commit 57c37c8f9258d26ed550e48a3239d82c86407215
Author: Prathmesh Sapate <85...@users.noreply.github.com>
AuthorDate: Thu Jul 9 00:40:02 2026 +0530
HDDS-15754. Rename TestableCluster to MockCluster (#10691)
---
.../balancer/{TestableCluster.java => MockCluster.java} | 6 +++---
.../hadoop/hdds/scm/container/balancer/MockedSCM.java | 12 ++++++------
.../balancer/TestContainerBalancerDatanodeNodeLimit.java | 6 +++---
.../balancer/TestContainerBalancerStatusInfo.java | 14 +++++++-------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestableCluster.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockCluster.java
similarity index 98%
rename from hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestableCluster.java
rename to hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockCluster.java
index 1e9591ab194..f912b76a896 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestableCluster.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockCluster.java
@@ -46,9 +46,9 @@
* 1. Fill the cluster by generating some data.
* 2. Nodes in the cluster have utilization values determined by generateUtilization method.
*/
-public final class TestableCluster {
+public final class MockCluster {
static final ThreadLocalRandom RANDOM = ThreadLocalRandom.current();
- private static final Logger LOG = LoggerFactory.getLogger(TestableCluster.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MockCluster.class);
private final int nodeCount;
private final double[] nodeUtilizationList;
private final DatanodeUsageInfo[] nodesInCluster;
@@ -57,7 +57,7 @@ public final class TestableCluster {
private final Map<DatanodeUsageInfo, Set<ContainerID>> dnUsageToContainersMap = new HashMap<>();
private final double averageUtilization;
- TestableCluster(int numberOfNodes, long storageUnit) {
+ MockCluster(int numberOfNodes, long storageUnit) {
nodeCount = numberOfNodes;
nodeUtilizationList = createUtilizationList(nodeCount);
nodesInCluster = new DatanodeUsageInfo[nodeCount];
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockedSCM.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockedSCM.java
index 3c6afc11a58..2d2d7daec22 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockedSCM.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockedSCM.java
@@ -60,20 +60,20 @@
/**
* Class for test used for setting up testable StorageContainerManager.
- * Provides an access to {@link TestableCluster} and to necessary mocked instances
+ * Provides an access to {@link MockCluster} and to necessary mocked instances
*/
public final class MockedSCM {
private final StorageContainerManager scm;
- private final TestableCluster cluster;
+ private final MockCluster cluster;
private final MockNodeManager mockNodeManager;
private final MockedReplicationManager mockedReplicaManager;
private final MoveManager moveManager;
private final ContainerManager containerManager;
private MockedPlacementPolicies mockedPlacementPolicies;
- public MockedSCM(@Nonnull TestableCluster testableCluster) {
+ public MockedSCM(@Nonnull MockCluster mockCluster) {
scm = mock(StorageContainerManager.class);
- cluster = testableCluster;
+ cluster = mockCluster;
mockNodeManager = new MockNodeManager(cluster.getDatanodeToContainersMap());
try {
moveManager = mockMoveManager();
@@ -185,7 +185,7 @@ public int getNodeCount() {
return scm;
}
- public @Nonnull TestableCluster getCluster() {
+ public @Nonnull MockCluster getCluster() {
return cluster;
}
@@ -201,7 +201,7 @@ public int getNodeCount() {
return mockedPlacementPolicies.ecPlacementPolicy;
}
- private static @Nonnull ContainerManager mockContainerManager(@Nonnull TestableCluster cluster)
+ private static @Nonnull ContainerManager mockContainerManager(@Nonnull MockCluster cluster)
throws ContainerNotFoundException {
ContainerManager containerManager = mock(ContainerManager.class);
Mockito
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerDatanodeNodeLimit.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerDatanodeNodeLimit.java
index 54d0621ebdf..f37eaab9654 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerDatanodeNodeLimit.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerDatanodeNodeLimit.java
@@ -17,7 +17,7 @@
package org.apache.hadoop.hdds.scm.container.balancer;
-import static org.apache.hadoop.hdds.scm.container.balancer.TestableCluster.RANDOM;
+import static org.apache.hadoop.hdds.scm.container.balancer.MockCluster.RANDOM;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -206,7 +206,7 @@ public void initializeIterationShouldUpdateUnBalancedNodesWhenThresholdChanges(@
@ParameterizedTest(name = "MockedSCM #{index}: {0}")
@MethodSource("createMockedSCMs")
public void testCalculationOfUtilization(@Nonnull MockedSCM mockedSCM) {
- TestableCluster cluster = mockedSCM.getCluster();
+ MockCluster cluster = mockedSCM.getCluster();
DatanodeUsageInfo[] nodesInCluster = cluster.getNodesInCluster();
double[] nodeUtilizations = cluster.getNodeUtilizationList();
assertEquals(nodesInCluster.length, nodeUtilizations.length);
@@ -605,7 +605,7 @@ private static boolean stillHaveUnbalancedNodes(@Nonnull ContainerBalancerTask t
}
public static @Nonnull MockedSCM getMockedSCM(int datanodeCount) {
- return new MockedSCM(new TestableCluster(datanodeCount, STORAGE_UNIT));
+ return new MockedSCM(new MockCluster(datanodeCount, STORAGE_UNIT));
}
private static CompletableFuture<MoveManager.MoveResult> genCompletableFuture(int sleepMilSec) {
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerStatusInfo.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerStatusInfo.java
index bb6f0c46277..6d082fe7cf5 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerStatusInfo.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerStatusInfo.java
@@ -42,7 +42,7 @@ class TestContainerBalancerStatusInfo {
@Test
void testGetIterationStatistics() {
- MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB));
+ MockedSCM mockedScm = new MockedSCM(new MockCluster(20, OzoneConsts.GB));
ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class);
@@ -63,7 +63,7 @@ void testGetIterationStatistics() {
@Test
void testReRequestIterationStatistics() throws Exception {
- MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB));
+ MockedSCM mockedScm = new MockedSCM(new MockCluster(20, OzoneConsts.GB));
ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class);
@@ -83,7 +83,7 @@ void testReRequestIterationStatistics() throws Exception {
@Test
void testGetCurrentStatisticsRequestInPeriodBetweenIterations() throws Exception {
- MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB));
+ MockedSCM mockedScm = new MockedSCM(new MockCluster(20, OzoneConsts.GB));
ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class);
@@ -104,7 +104,7 @@ void testGetCurrentStatisticsRequestInPeriodBetweenIterations() throws Exception
@Test
void testCurrentStatisticsDoesntChangeWhenReRequestInPeriodBetweenIterations() throws InterruptedException {
- MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB));
+ MockedSCM mockedScm = new MockedSCM(new MockCluster(20, OzoneConsts.GB));
ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class);
@@ -128,7 +128,7 @@ void testCurrentStatisticsDoesntChangeWhenReRequestInPeriodBetweenIterations() t
@Test
void testGetCurrentStatisticsWithDelay() throws Exception {
- MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB));
+ MockedSCM mockedScm = new MockedSCM(new MockCluster(20, OzoneConsts.GB));
ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class);
@@ -148,7 +148,7 @@ void testGetCurrentStatisticsWithDelay() throws Exception {
@Test
void testGetCurrentStatisticsWhileBalancingInProgress() throws Exception {
- MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB));
+ MockedSCM mockedScm = new MockedSCM(new MockCluster(20, OzoneConsts.GB));
ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class);
@@ -238,7 +238,7 @@ private static Long getTotalMovedData(Map<DatanodeID, Long> iteration) {
*/
@Test
void testGetCurrentIterationsStatisticDoesNotThrowNullPointerExceptionWhenBalancingThreadIsSleeping() {
- MockedSCM mockedScm = new MockedSCM(new TestableCluster(10, OzoneConsts.GB));
+ MockedSCM mockedScm = new MockedSCM(new MockCluster(10, OzoneConsts.GB));
OzoneConfiguration ozoneConfig = new OzoneConfiguration();
ContainerBalancerConfiguration config = ozoneConfig.getObject(ContainerBalancerConfiguration.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org