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 3262133beeb HDDS-14618. Support including only specified containers in
Container Balancer (#9839)
3262133beeb is described below
commit 3262133beeb9b256eebe2119b693c80c0bcc4877
Author: sravani <[email protected]>
AuthorDate: Sat Mar 7 18:05:46 2026 +0530
HDDS-14618. Support including only specified containers in Container
Balancer (#9839)
---
.../balancer/ContainerBalancerConfiguration.java | 34 ++++++++++++++++++++++
.../apache/hadoop/hdds/scm/client/ScmClient.java | 3 +-
.../protocol/StorageContainerLocationProtocol.java | 3 +-
...inerLocationProtocolClientSideTranslatorPB.java | 8 ++++-
.../src/main/proto/ScmAdminProtocol.proto | 1 +
.../interface-client/src/main/proto/hdds.proto | 1 +
.../ContainerBalancerSelectionCriteria.java | 9 ++++++
...inerLocationProtocolServerSideTranslatorPB.java | 7 ++++-
.../hdds/scm/server/SCMClientProtocolServer.java | 9 +++++-
.../TestContainerBalancerDatanodeNodeLimit.java | 17 +++++++++++
.../scm/cli/ContainerBalancerStartSubcommand.java | 10 ++++++-
.../scm/cli/ContainerBalancerStatusSubcommand.java | 3 ++
.../hdds/scm/cli/ContainerOperationClient.java | 5 ++--
.../datanode/TestContainerBalancerSubCommand.java | 5 ++--
.../ozone/TestContainerBalancerOperations.java | 15 ++++++----
15 files changed, 115 insertions(+), 15 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
index df7039cc620..8ff3b6e5e20 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
@@ -91,6 +91,12 @@ public final class ContainerBalancerConfiguration {
"to exclude from balancing. For example \"1, 4, 5\" or \"1,4,5\".")
private String excludeContainers = "";
+ @Config(key = "hdds.container.balancer.include.containers", type =
ConfigType.STRING, defaultValue =
+ "", tags = {ConfigTag.BALANCER}, description = "List of container IDs " +
+ "to include in balancing. Only these containers will be included in
balancing. " +
+ "For example \"1, 4, 5\" or \"1,4,5\".")
+ private String includeContainers = "";
+
@Config(key = "hdds.container.balancer.move.timeout", type =
ConfigType.TIME, defaultValue = "65m",
tags = {ConfigTag.BALANCER}, description =
"The amount of time to allow a single container to move " +
@@ -311,6 +317,17 @@ public Set<ContainerID> getExcludeContainers() {
}).collect(Collectors.toSet());
}
+ public Set<ContainerID> getIncludeContainers() {
+ if (includeContainers.isEmpty()) {
+ return new HashSet<>();
+ }
+ return Arrays.stream(includeContainers.split(","))
+ .map(s -> {
+ s = s.trim();
+ return ContainerID.valueOf(Long.parseLong(s));
+ }).collect(Collectors.toSet());
+ }
+
/**
* Sets containers to exclude from balancing.
* @param excludeContainers String of {@link ContainerID} to exclude. For
@@ -320,6 +337,16 @@ public void setExcludeContainers(String excludeContainers)
{
this.excludeContainers = excludeContainers;
}
+ /**
+ * Sets containers to include in balancing. When non-empty, only these
+ * containers will be considered for balancing.
+ * @param includeContainers String of {@link ContainerID} to include. For
+ * example, "1, 4, 5" or "1,4,5".
+ */
+ public void setIncludeContainers(String includeContainers) {
+ this.includeContainers = includeContainers;
+ }
+
public Duration getMoveTimeout() {
return Duration.ofMillis(moveTimeout);
}
@@ -422,6 +449,7 @@ public String toString() {
"%-50s %s%n" +
"%-50s %s%n" +
"%-50s %s%n" +
+ "%-50s %s%n" +
"%-50s %s%n", "Key", "Value", "Threshold",
threshold, "Max Datanodes to Involve per Iteration(percent)",
maxDatanodesPercentageToInvolvePerIteration,
@@ -443,6 +471,8 @@ public String toString() {
networkTopologyEnable,
"Whether to Trigger Refresh Datanode Usage Info",
triggerDuEnable,
+ "Container IDs to Include in Balancing",
+ includeContainers.isEmpty() ? "None" : includeContainers,
"Container IDs to Exclude from Balancing",
excludeContainers.equals("") ? "None" : excludeContainers,
"Datanodes Specified to be Balanced",
@@ -463,6 +493,7 @@ public ContainerBalancerConfigurationProto.Builder
toProtobufBuilder() {
.setSizeLeavingSourceMax(maxSizeLeavingSource)
.setIterations(iterations)
.setExcludeContainers(excludeContainers)
+ .setIncludeContainers(includeContainers)
.setMoveTimeout(moveTimeout)
.setBalancingIterationInterval(balancingInterval)
.setIncludeDatanodes(includeNodes)
@@ -497,6 +528,9 @@ static ContainerBalancerConfiguration fromProtobuf(
if (proto.hasIterations()) {
config.setIterations(proto.getIterations());
}
+ if (proto.hasIncludeContainers()) {
+ config.setIncludeContainers(proto.getIncludeContainers());
+ }
if (proto.hasExcludeContainers()) {
config.setExcludeContainers(proto.getExcludeContainers());
}
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
index 5ef0515b92e..fac1467dd8f 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
@@ -376,7 +376,8 @@ StartContainerBalancerResponseProto startContainerBalancer(
Optional<Boolean> networkTopologyEnable,
Optional<String> includeNodes,
Optional<String> excludeNodes,
- Optional<String> excludeContainers) throws IOException;
+ Optional<String> excludeContainers,
+ Optional<String> includeContainers) throws IOException;
/**
* Stop ContainerBalancer.
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
index 8e04ed225d6..b057efb1ff8 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
@@ -442,7 +442,8 @@ StartContainerBalancerResponseProto startContainerBalancer(
Optional<Boolean> networkTopologyEnable,
Optional<String> includeNodes,
Optional<String> excludeNodes,
- Optional<String> excludeContainers) throws IOException;
+ Optional<String> excludeContainers,
+ Optional<String> includeContainers) throws IOException;
/**
* Stop ContainerBalancer.
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
index 832aa478dbd..01e3d709cf0 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
@@ -966,7 +966,8 @@ public StartContainerBalancerResponseProto
startContainerBalancer(
Optional<Boolean> networkTopologyEnable,
Optional<String> includeNodes,
Optional<String> excludeNodes,
- Optional<String> excludeContainers) throws IOException {
+ Optional<String> excludeContainers,
+ Optional<String> includeContainers) throws IOException {
StartContainerBalancerRequestProto.Builder builder =
StartContainerBalancerRequestProto.newBuilder();
builder.setTraceID(TracingUtil.exportCurrentSpan());
@@ -1057,6 +1058,11 @@ public StartContainerBalancerResponseProto
startContainerBalancer(
builder.setExcludeContainers(ec);
}
+ if (includeContainers.isPresent()) {
+ String ic = includeContainers.get();
+ builder.setIncludeContainers(ic);
+ }
+
StartContainerBalancerRequestProto request = builder.build();
return submitRequest(Type.StartContainerBalancer,
builder1 -> builder1.setStartContainerBalancerRequest(request))
diff --git a/hadoop-hdds/interface-admin/src/main/proto/ScmAdminProtocol.proto
b/hadoop-hdds/interface-admin/src/main/proto/ScmAdminProtocol.proto
index d1aa4798bb6..455f048d8b5 100644
--- a/hadoop-hdds/interface-admin/src/main/proto/ScmAdminProtocol.proto
+++ b/hadoop-hdds/interface-admin/src/main/proto/ScmAdminProtocol.proto
@@ -604,6 +604,7 @@ message StartContainerBalancerRequestProto {
optional string includeNodes = 14;
optional string excludeNodes = 15;
optional string excludeContainers = 16;
+ optional string includeContainers = 17;
}
message StartContainerBalancerResponseProto {
diff --git a/hadoop-hdds/interface-client/src/main/proto/hdds.proto
b/hadoop-hdds/interface-client/src/main/proto/hdds.proto
index eb819b80a3e..2f20fde3e09 100644
--- a/hadoop-hdds/interface-client/src/main/proto/hdds.proto
+++ b/hadoop-hdds/interface-client/src/main/proto/hdds.proto
@@ -503,6 +503,7 @@ message ContainerBalancerConfigurationProto {
required bool shouldRun = 18;
optional int32 nextIterationIndex = 19;
optional int64 moveReplicationTimeout = 20;
+ optional string includeContainers = 21;
}
message TransferLeadershipRequestProto {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerSelectionCriteria.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerSelectionCriteria.java
index c74ae7dd411..52f34347c9a 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerSelectionCriteria.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerSelectionCriteria.java
@@ -54,6 +54,7 @@ public class ContainerBalancerSelectionCriteria {
private ContainerManager containerManager;
private Map<ContainerID, DatanodeDetails> containerToSourceMap;
private Set<ContainerID> excludeContainers;
+ private Set<ContainerID> includeContainers;
private Set<ContainerID> excludeContainersDueToFailure;
private FindSourceStrategy findSourceStrategy;
private Map<DatanodeDetails, NavigableSet<ContainerID>> setMap;
@@ -72,6 +73,7 @@ public ContainerBalancerSelectionCriteria(
this.containerToSourceMap = containerToSourceMap;
excludeContainersDueToFailure = new HashSet<>();
excludeContainers = balancerConfiguration.getExcludeContainers();
+ includeContainers = balancerConfiguration.getIncludeContainers();
this.findSourceStrategy = findSourceStrategy;
this.setMap = new HashMap<>();
}
@@ -158,6 +160,10 @@ private Comparator<ContainerID>
orderContainersByUsedBytes() {
public boolean shouldBeExcluded(ContainerID containerID,
DatanodeDetails node, long sizeMovedAlready) {
ContainerInfo container;
+ //If includeContainers is specified, exclude containers not in the include
list
+ if (!includeContainers.isEmpty() &&
!includeContainers.contains(containerID)) {
+ return true;
+ }
try {
container = containerManager.getContainer(containerID);
} catch (ContainerNotFoundException e) {
@@ -263,6 +269,9 @@ private NavigableSet<ContainerID>
getCandidateContainers(DatanodeDetails node) {
new TreeSet<>(orderContainersByUsedBytes().reversed());
try {
Set<ContainerID> idSet = nodeManager.getContainers(node);
+ if (includeContainers != null && !includeContainers.isEmpty()) {
+ idSet.retainAll(includeContainers);
+ }
if (excludeContainers != null) {
idSet.removeAll(excludeContainers);
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
index 287ae47c06f..2765cabec03 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
@@ -1146,6 +1146,7 @@ public StartContainerBalancerResponseProto
startContainerBalancer(
Optional<String> includeNodes = Optional.empty();
Optional<String> excludeNodes = Optional.empty();
Optional<String> excludeContainers = Optional.empty();
+ Optional<String> includeContainers = Optional.empty();
if (request.hasThreshold()) {
threshold = Optional.of(request.getThreshold());
@@ -1210,12 +1211,16 @@ public StartContainerBalancerResponseProto
startContainerBalancer(
excludeContainers = Optional.of(request.getExcludeContainers());
}
+ if (request.hasIncludeContainers()) {
+ includeContainers = Optional.of(request.getIncludeContainers());
+ }
+
return impl.startContainerBalancer(threshold, iterations,
maxDatanodesPercentageToInvolvePerIteration,
maxSizeToMovePerIterationInGB, maxSizeEnteringTargetInGB,
maxSizeLeavingSourceInGB, balancingInterval, moveTimeout,
moveReplicationTimeout, networkTopologyEnable, includeNodes,
- excludeNodes, excludeContainers);
+ excludeNodes, excludeContainers, includeContainers);
}
public StopContainerBalancerResponseProto stopContainerBalancer(
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
index 80fbb062e90..f500dc82330 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
@@ -1161,7 +1161,8 @@ public StartContainerBalancerResponseProto
startContainerBalancer(
Optional<Boolean> networkTopologyEnable,
Optional<String> includeNodes,
Optional<String> excludeNodes,
- Optional<String> excludeContainers) throws IOException {
+ Optional<String> excludeContainers,
+ Optional<String> includeContainers) throws IOException {
Map<String, String> auditMap = Maps.newHashMap();
try {
getScm().checkAdminAccess(getRemoteUser(), false);
@@ -1277,6 +1278,12 @@ public StartContainerBalancerResponseProto
startContainerBalancer(
cbc.setExcludeContainers(ec);
}
+ if (includeContainers.isPresent()) {
+ String ic = includeContainers.get();
+ auditMap.put("includeContainers", (ic));
+ cbc.setIncludeContainers(ic);
+ }
+
ContainerBalancer containerBalancer = scm.getContainerBalancer();
containerBalancer.startBalancer(cbc);
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 d5ecbb34e62..3bf6f28c587 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
@@ -459,6 +459,23 @@ public void
balancerShouldNotSelectConfiguredExcludeContainers(@Nonnull MockedSC
}
}
+ @ParameterizedTest(name = "MockedSCM #{index}: {0}")
+ @MethodSource("createMockedSCMs")
+ public void balancerShouldOnlySelectConfiguredIncludeContainers(@Nonnull
MockedSCM mockedSCM) {
+ ContainerBalancerConfiguration config = new
ContainerBalancerConfigBuilder(mockedSCM.getNodeCount()).build();
+ config.setIncludeContainers("1, 4, 5");
+
+ ContainerBalancerTask task = mockedSCM.startBalancerTask(config);
+
+ Set<ContainerID> includeContainers = config.getIncludeContainers();
+ assertThat(task.getContainerToSourceMap()).isNotEmpty();
+ for (ContainerID container : task.getContainerToSourceMap().keySet()) {
+ assertThat(includeContainers)
+ .as("Container %s should be in the include list", container)
+ .contains(container);
+ }
+ }
+
@ParameterizedTest(name = "MockedSCM #{index}: {0}")
@MethodSource("createMockedSCMs")
public void checkIterationResult(@Nonnull MockedSCM mockedSCM) {
diff --git
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
index 2a9925c3c26..cd34522d6a6 100644
---
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
+++
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
@@ -126,6 +126,14 @@ public class ContainerBalancerStartSubcommand extends
ScmSubcommand {
"(specify \"1,2,3\" for container IDs).")
private Optional<String> excludeContainers;
+ @Option(names = {"--include-containers"},
+ description = "A list of container IDs separated by commas. " +
+ "Only the containers specified in this list will be included in
balancing." +
+ " If --exclude-containers is also specified, those containers will "
+
+ "be excluded. This configuration is empty by default " +
+ "(specify \"1,2,3\" for container IDs).")
+ private Optional<String> includeContainers;
+
@Override
public void execute(ScmClient scmClient) throws IOException {
StartContainerBalancerResponseProto response = scmClient.
@@ -134,7 +142,7 @@ public void execute(ScmClient scmClient) throws IOException
{
maxSizeToMovePerIterationInGB, maxSizeEnteringTargetInGB,
maxSizeLeavingSourceInGB, balancingInterval, moveTimeout,
moveReplicationTimeout, networkTopologyEnable, includeNodes,
- excludeNodes, excludeContainers);
+ excludeNodes, excludeContainers, includeContainers);
if (response.getStart()) {
System.out.println("Container Balancer started successfully.");
} else {
diff --git
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
index c18491c2da5..82e610c5e93 100644
---
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
+++
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
@@ -122,6 +122,7 @@ String
getConfigurationPrettyString(HddsProtos.ContainerBalancerConfigurationPro
"%-50s %s%n" +
"%-50s %s%n" +
"%-50s %s%n" +
+ "%-50s %s%n" +
"%-50s %s%n", "Key", "Value", "Threshold",
configuration.getUtilizationThreshold(), "Max Datanodes to Involve
per Iteration(percent)",
configuration.getDatanodesInvolvedMaxPercentagePerIteration(),
@@ -143,6 +144,8 @@ String
getConfigurationPrettyString(HddsProtos.ContainerBalancerConfigurationPro
configuration.getMoveNetworkTopologyEnable(),
"Whether to Trigger Refresh Datanode Usage Info",
configuration.getTriggerDuBeforeMoveEnable(),
+ "Container IDs to Include in Balancing",
+ configuration.getIncludeContainers().isEmpty() ? "None" :
configuration.getIncludeContainers(),
"Container IDs to Exclude from Balancing",
configuration.getExcludeContainers().isEmpty() ? "None" :
configuration.getExcludeContainers(),
"Datanodes Specified to be Balanced",
diff --git
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
index ea50f9d6056..18950053e44 100644
---
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
+++
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
@@ -525,13 +525,14 @@ public StartContainerBalancerResponseProto
startContainerBalancer(
Optional<Boolean> networkTopologyEnable,
Optional<String> includeNodes,
Optional<String> excludeNodes,
- Optional<String> excludeContainers) throws IOException {
+ Optional<String> excludeContainers,
+ Optional<String> includeContainers) throws IOException {
return storageContainerLocationClient.startContainerBalancer(threshold,
iterations, maxDatanodesPercentageToInvolvePerIteration,
maxSizeToMovePerIterationInGB, maxSizeEnteringTargetInGB,
maxSizeLeavingSourceInGB, balancingInterval, moveTimeout,
moveReplicationTimeout, networkTopologyEnable, includeNodes,
- excludeNodes, excludeContainers);
+ excludeNodes, excludeContainers, includeContainers);
}
@Override
diff --git
a/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
index d71b8d00be2..c3afd9b844c 100644
---
a/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
+++
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
@@ -80,6 +80,7 @@ class TestContainerBalancerSubCommand {
"Interval between each Iteration 0min\n" +
"Whether to Enable Network Topology false\n" +
"Whether to Trigger Refresh Datanode Usage Info false\n" +
+ "Container IDs to Include in Balancing None\n" +
"Container IDs to Exclude from Balancing None\n" +
"Datanodes Specified to be Balanced None\n" +
"Datanodes Excluded from Balancing None";
@@ -449,7 +450,7 @@ public void
testContainerBalancerStartSubcommandWhenBalancerIsNotRunning()
throws IOException {
ScmClient scmClient = mock(ScmClient.class);
when(scmClient.startContainerBalancer(
- null, null, null, null, null, null, null, null, null, null, null,
null, null))
+ null, null, null, null, null, null, null, null, null, null, null,
null, null, null))
.thenReturn(
StorageContainerLocationProtocolProtos
.StartContainerBalancerResponseProto.newBuilder()
@@ -465,7 +466,7 @@ public void
testContainerBalancerStartSubcommandWhenBalancerIsRunning()
throws IOException {
ScmClient scmClient = mock(ScmClient.class);
when(scmClient.startContainerBalancer(
- null, null, null, null, null, null, null, null, null, null, null,
null, null))
+ null, null, null, null, null, null, null, null, null, null, null,
null, null, null))
.thenReturn(StorageContainerLocationProtocolProtos
.StartContainerBalancerResponseProto.newBuilder()
.setStart(false)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerBalancerOperations.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerBalancerOperations.java
index 34b990278ab..bb8d0704538 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerBalancerOperations.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerBalancerOperations.java
@@ -94,12 +94,13 @@ public void testContainerBalancerCLIOperations() throws
Exception {
Optional<String> includeNodes = Optional.of("");
Optional<String> excludeNodes = Optional.of("");
Optional<String> excludeContainers = Optional.of("");
+ Optional<String> includeContainers = Optional.of("");
containerBalancerClient.startContainerBalancer(threshold, iterations,
maxDatanodesPercentageToInvolvePerIteration,
maxSizeToMovePerIterationInGB, maxSizeEnteringTargetInGB,
maxSizeLeavingSourceInGB, balancingInterval, moveTimeout,
moveReplicationTimeout, networkTopologyEnable, includeNodes,
- excludeNodes, excludeContainers);
+ excludeNodes, excludeContainers, includeContainers);
running = containerBalancerClient.getContainerBalancerStatus();
assertTrue(running);
@@ -121,7 +122,7 @@ public void testContainerBalancerCLIOperations() throws
Exception {
maxSizeToMovePerIterationInGB, maxSizeEnteringTargetInGB,
maxSizeLeavingSourceInGB, balancingInterval, moveTimeout,
moveReplicationTimeout, networkTopologyEnable, includeNodes,
- excludeNodes, excludeContainers);
+ excludeNodes, excludeContainers, includeContainers);
running = containerBalancerClient.getContainerBalancerStatus();
assertTrue(running);
@@ -149,6 +150,7 @@ public void testIfCBCLIOverridesConfigs() throws Exception {
Optional<Integer> iterations = Optional.empty();
Optional<Integer> balancingInterval = Optional.empty();
String excludedContainersList = "1,2,3";
+ String includedContainersList = "4,5";
//CLI options are passed
Optional<Double> threshold = Optional.of(0.1);
@@ -163,12 +165,13 @@ public void testIfCBCLIOverridesConfigs() throws
Exception {
Optional<String> includeNodes = Optional.of("");
Optional<String> excludeNodes = Optional.of("");
Optional<String> excludeContainers = Optional.of(excludedContainersList);
+ Optional<String> includeContainers = Optional.of(includedContainersList);
containerBalancerClient.startContainerBalancer(threshold, iterations,
maxDatanodesPercentageToInvolvePerIteration,
maxSizeToMovePerIterationInGB, maxSizeEnteringTargetInGB,
maxSizeLeavingSourceInGB, balancingInterval, moveTimeout,
moveReplicationTimeout, networkTopologyEnable, includeNodes,
- excludeNodes, excludeContainers);
+ excludeNodes, excludeContainers, includeContainers);
running = containerBalancerClient.getContainerBalancerStatus();
assertTrue(running);
@@ -186,8 +189,9 @@ public void testIfCBCLIOverridesConfigs() throws Exception {
//then it takes the CLI option.
assertEquals(100, config.getMaxDatanodesPercentageToInvolvePerIteration());
- //Verifies that the 'excludeContainers' passed via CLI overrides the
default empty set
+ //Verifies that excluded and included containers passed via CLI overrides
the default empty set
assertEquals(parseContainerIDs(excludedContainersList),
config.getExcludeContainers());
+ assertEquals(parseContainerIDs(includedContainersList),
config.getIncludeContainers());
containerBalancerClient.stopContainerBalancer();
running = containerBalancerClient.getContainerBalancerStatus();
@@ -218,12 +222,13 @@ public void testStopBalancerIdempotent() throws
IOException {
Optional<String> includeNodes = Optional.of("");
Optional<String> excludeNodes = Optional.of("");
Optional<String> excludeContainers = Optional.of("");
+ Optional<String> includeContainers = Optional.of("");
containerBalancerClient.startContainerBalancer(threshold, iterations,
maxDatanodesPercentageToInvolvePerIteration,
maxSizeToMovePerIterationInGB, maxSizeEnteringTargetInGB,
maxSizeLeavingSourceInGB, balancingInterval, moveTimeout,
moveReplicationTimeout, networkTopologyEnable, includeNodes,
- excludeNodes, excludeContainers);
+ excludeNodes, excludeContainers, includeContainers);
running = containerBalancerClient.getContainerBalancerStatus();
assertTrue(running);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
