Skip to content

HDDS-6976. 0GB data moved by container balancer after successful iteration #3604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
siddhantsangwan merged 3 commits into from
Jul 21, 2022
Merged

HDDS-6976. 0GB data moved by container balancer after successful iteration #3604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7467c40
HDDS-6976. 0GB data moved by container balancer after successful iter…
siddhantsangwan Jul 18, 2022
cb5981d
log number of container moves and represent size in bytes at the end …
siddhantsangwan Jul 19, 2022
97359a2
do appropriate size unit conversion in logs
siddhantsangwan Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions ...er-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -82,7 +83,9 @@ public class ContainerBalancer extends StatefulService {
private double maxDatanodesRatioToInvolvePerIteration;
private long maxSizeToMovePerIteration;
private int countDatanodesInvolvedPerIteration;
private long sizeMovedPerIteration;
private long sizeScheduledForMoveInLatestIteration;
// count actual size moved in bytes
private long sizeActuallyMovedInLatestIteration;
private int iterations;
private List<DatanodeUsageInfo> unBalancedNodes;
private List<DatanodeUsageInfo> overUtilizedNodes;
Expand Down Expand Up @@ -536,12 +539,16 @@ private void checkIterationMoveResults(Set<DatanodeDetails> selectedTargets) {
metrics.getNumContainerMovesCompletedInLatestIteration());
metrics.incrementNumContainerMovesTimeout(
metrics.getNumContainerMovesTimeoutInLatestIteration());
metrics.incrementDataSizeMovedGBInLatestIteration(
sizeActuallyMovedInLatestIteration / OzoneConsts.GB);
metrics.incrementDataSizeMovedGB(
metrics.getDataSizeMovedGBInLatestIteration());
LOG.info("Number of datanodes involved in this iteration: {}. Size moved " +
"in this iteration: {}GB.",
LOG.info("Iteration Summary. Number of Datanodes involved: {}. Size " +
"moved: {} ({} Bytes). Number of Container moves completed: {}.",
countDatanodesInvolvedPerIteration,
metrics.getDataSizeMovedGBInLatestIteration());
StringUtils.byteDesc(sizeActuallyMovedInLatestIteration),
sizeActuallyMovedInLatestIteration,
metrics.getNumContainerMovesCompletedInLatestIteration());
}

/**
Expand Down Expand Up @@ -601,14 +608,15 @@ private boolean checkIterationLimits() {
}
return true;
}
if (sizeMovedPerIteration + (long) ozoneConfiguration.getStorageSize(
if (sizeScheduledForMoveInLatestIteration +
(long) ozoneConfiguration.getStorageSize(
ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE,
ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE_DEFAULT,
StorageUnit.BYTES) > maxSizeToMovePerIteration) {
if (LOG.isDebugEnabled()) {
LOG.debug("Hit max size to move limit. {} bytes have already been " +
"scheduled for balancing and the limit is {} bytes.",
sizeMovedPerIteration,
sizeScheduledForMoveInLatestIteration,
maxSizeToMovePerIteration);
}
return true;
Expand Down Expand Up @@ -645,8 +653,8 @@ private boolean moveContainer(DatanodeDetails source,
moveSelection.getTargetNode().getUuidString(), ex);
} else {
if (result == LegacyReplicationManager.MoveResult.COMPLETED) {
metrics.incrementDataSizeMovedGBInLatestIteration(
containerInfo.getUsedBytes() / OzoneConsts.GB);
sizeActuallyMovedInLatestIteration +=
containerInfo.getUsedBytes();
if (LOG.isDebugEnabled()) {
LOG.debug(
"Container move completed for container {} to target {}",
Expand Down Expand Up @@ -812,7 +820,7 @@ private void incSizeSelectedForMoving(DatanodeDetails source,
return;
}
long size = container.getUsedBytes();
sizeMovedPerIteration += size;
sizeScheduledForMoveInLatestIteration += size;

// update sizeLeavingNode map with the recent moveSelection
findSourceStrategy.increaseSizeLeaving(source, size);
Expand All @@ -833,7 +841,8 @@ private void resetState() {
this.underUtilizedNodes.clear();
this.unBalancedNodes.clear();
this.countDatanodesInvolvedPerIteration = 0;
this.sizeMovedPerIteration = 0;
this.sizeScheduledForMoveInLatestIteration = 0;
this.sizeActuallyMovedInLatestIteration = 0;
metrics.resetDataSizeMovedGBInLatestIteration();
metrics.resetNumContainerMovesCompletedInLatestIteration();
metrics.resetNumContainerMovesTimeoutInLatestIteration();
Expand Down Expand Up @@ -1262,8 +1271,8 @@ int getCountDatanodesInvolvedPerIteration() {
}

@VisibleForTesting
public long getSizeMovedPerIteration() {
return sizeMovedPerIteration;
public long getSizeScheduledForMoveInLatestIteration() {
return sizeScheduledForMoveInLatestIteration;
}

public ContainerBalancerMetrics getMetrics() {
Expand Down
58 changes: 30 additions & 28 deletions ...cm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public class TestContainerBalancer {
private static final ThreadLocalRandom RANDOM = ThreadLocalRandom.current();

private StatefulServiceStateManager serviceStateManager;
private static final long STORAGE_UNIT = OzoneConsts.GB;

/**
* Sets up configuration values and creates a mock cluster.
Expand All @@ -123,8 +124,8 @@ public void setup() throws IOException, NodeNotFoundException,
balancerConfiguration.setThreshold(10);
balancerConfiguration.setIterations(1);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeEnteringTarget(50 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * STORAGE_UNIT);
balancerConfiguration.setMaxSizeEnteringTarget(50 * STORAGE_UNIT);
conf.setFromObject(balancerConfiguration);
GenericTestUtils.setLogLevel(ContainerBalancer.LOG, Level.DEBUG);

Expand Down Expand Up @@ -282,7 +283,7 @@ public void containerBalancerShouldObeyMaxDatanodesToInvolveLimit()
int percent = 20;
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(
percent);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * STORAGE_UNIT);
balancerConfiguration.setThreshold(1);
balancerConfiguration.setIterations(1);
startBalancer(balancerConfiguration);
Expand Down Expand Up @@ -347,15 +348,16 @@ public void containerBalancerShouldObeyMaxSizeToMoveLimit()
throws IllegalContainerBalancerStateException, IOException,
InvalidContainerBalancerConfigurationException, TimeoutException {
balancerConfiguration.setThreshold(1);
balancerConfiguration.setMaxSizeToMovePerIteration(10 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(10 * STORAGE_UNIT);
balancerConfiguration.setIterations(1);
startBalancer(balancerConfiguration);

sleepWhileBalancing(500);

// balancer should not have moved more size than the limit
Assertions.assertFalse(containerBalancer.getSizeMovedPerIteration() >
10 * OzoneConsts.GB);
Assertions.assertFalse(
containerBalancer.getSizeScheduledForMoveInLatestIteration() >
10 * STORAGE_UNIT);

long size = containerBalancer.getMetrics()
.getDataSizeMovedGBInLatestIteration();
Expand All @@ -369,7 +371,7 @@ public void targetDatanodeShouldNotAlreadyContainSelectedContainer()
throws IllegalContainerBalancerStateException, IOException,
InvalidContainerBalancerConfigurationException, TimeoutException {
balancerConfiguration.setThreshold(10);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * STORAGE_UNIT);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);
startBalancer(balancerConfiguration);

Expand Down Expand Up @@ -398,7 +400,7 @@ public void containerMoveSelectionShouldFollowPlacementPolicy()
throws IllegalContainerBalancerStateException, IOException,
InvalidContainerBalancerConfigurationException, TimeoutException {
balancerConfiguration.setThreshold(10);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * STORAGE_UNIT);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);
startBalancer(balancerConfiguration);

Expand Down Expand Up @@ -443,8 +445,8 @@ public void targetDatanodeShouldBeInServiceHealthy()
TimeoutException {
balancerConfiguration.setThreshold(10);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeEnteringTarget(50 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * STORAGE_UNIT);
balancerConfiguration.setMaxSizeEnteringTarget(50 * STORAGE_UNIT);
startBalancer(balancerConfiguration);

// waiting for balance completed.
Expand Down Expand Up @@ -472,8 +474,8 @@ public void selectedContainerShouldNotAlreadyHaveBeenSelected()
InvalidContainerBalancerConfigurationException, TimeoutException {
balancerConfiguration.setThreshold(10);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeEnteringTarget(50 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * STORAGE_UNIT);
balancerConfiguration.setMaxSizeEnteringTarget(50 * STORAGE_UNIT);

startBalancer(balancerConfiguration);

Expand All @@ -500,8 +502,8 @@ public void balancerShouldNotSelectConfiguredExcludeContainers()
InvalidContainerBalancerConfigurationException, TimeoutException {
balancerConfiguration.setThreshold(10);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeEnteringTarget(50 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * STORAGE_UNIT);
balancerConfiguration.setMaxSizeEnteringTarget(50 * STORAGE_UNIT);
balancerConfiguration.setExcludeContainers("1, 4, 5");

startBalancer(balancerConfiguration);
Expand Down Expand Up @@ -532,7 +534,7 @@ public void balancerShouldObeyMaxSizeEnteringTargetLimit()
conf.getObject(ContainerBalancerConfiguration.class);
balancerConfiguration.setThreshold(10);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(50 * STORAGE_UNIT);

// no containers should be selected when the limit is just 2 MB
balancerConfiguration.setMaxSizeEnteringTarget(2 * OzoneConsts.MB);
Expand Down Expand Up @@ -565,9 +567,9 @@ public void testMetrics()
balancerConfiguration.setBalancingInterval(Duration.ofMillis(2));
balancerConfiguration.setThreshold(10);
balancerConfiguration.setIterations(1);
balancerConfiguration.setMaxSizeEnteringTarget(6 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeEnteringTarget(6 * STORAGE_UNIT);
// deliberately set max size per iteration to a low value, 6 GB
balancerConfiguration.setMaxSizeToMovePerIteration(6 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(6 * STORAGE_UNIT);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);

startBalancer(balancerConfiguration);
Expand Down Expand Up @@ -596,8 +598,8 @@ public void balancerShouldFollowExcludeAndIncludeDatanodesConfigurations()
InvalidContainerBalancerConfigurationException, TimeoutException {
balancerConfiguration.setThreshold(10);
balancerConfiguration.setIterations(1);
balancerConfiguration.setMaxSizeEnteringTarget(10 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeEnteringTarget(10 * STORAGE_UNIT);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * STORAGE_UNIT);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);

// only these nodes should be included
Expand Down Expand Up @@ -670,8 +672,8 @@ public void checkIterationResult()
TimeoutException {
balancerConfiguration.setThreshold(10);
balancerConfiguration.setIterations(1);
balancerConfiguration.setMaxSizeEnteringTarget(10 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeEnteringTarget(10 * STORAGE_UNIT);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * STORAGE_UNIT);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);

startBalancer(balancerConfiguration);
Expand All @@ -695,7 +697,7 @@ public void checkIterationResult()
Mockito.any(DatanodeDetails.class)))
.thenReturn(CompletableFuture.completedFuture(
MoveResult.REPLICATION_FAIL_NODE_UNHEALTHY));
balancerConfiguration.setMaxSizeToMovePerIteration(10 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(10 * STORAGE_UNIT);

startBalancer(balancerConfiguration);
sleepWhileBalancing(1000);
Expand All @@ -720,8 +722,8 @@ public void checkIterationResultTimeout()

balancerConfiguration.setThreshold(10);
balancerConfiguration.setIterations(1);
balancerConfiguration.setMaxSizeEnteringTarget(10 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeEnteringTarget(10 * STORAGE_UNIT);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * STORAGE_UNIT);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);
balancerConfiguration.setMoveTimeout(Duration.ofMillis(1000));

Expand Down Expand Up @@ -762,8 +764,8 @@ public void checkIterationResultTimeoutFromReplicationManager()

balancerConfiguration.setThreshold(10);
balancerConfiguration.setIterations(1);
balancerConfiguration.setMaxSizeEnteringTarget(10 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * OzoneConsts.GB);
balancerConfiguration.setMaxSizeEnteringTarget(10 * STORAGE_UNIT);
balancerConfiguration.setMaxSizeToMovePerIteration(100 * STORAGE_UNIT);
balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);
balancerConfiguration.setMoveTimeout(Duration.ofMillis(1000));

Expand Down Expand Up @@ -857,7 +859,7 @@ private double createCluster() {

// use node utilization and used space to determine node capacity
if (nodeUtilizations.get(i) == 0) {
datanodeCapacity = OzoneConsts.GB * RANDOM.nextInt(10, 60);
datanodeCapacity = STORAGE_UNIT * RANDOM.nextInt(10, 60);
} else {
datanodeCapacity = (long) (datanodeUsedSpace / nodeUtilizations.get(i));
}
Expand Down Expand Up @@ -914,7 +916,7 @@ private ContainerInfo createContainer(long id, int multiple) {
.getInstance(HddsProtos.ReplicationFactor.THREE))
.setState(HddsProtos.LifeCycleState.CLOSED)
.setOwner("TestContainerBalancer")
.setUsedBytes(OzoneConsts.GB * multiple)
.setUsedBytes(STORAGE_UNIT * multiple)
.build();
}

Expand Down