Skip to content

HDDS-8358. Fix the space usage comparator in ContainerBalancerSelectionCriteria #4527

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
adoroszlai merged 2 commits into from
Apr 4, 2023
Merged

HDDS-8358. Fix the space usage comparator in ContainerBalancerSelectionCriteria #4527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91bfcf4
HDDS-8358. Fix the test setup in TestContainerBalancerTask
siddhantsangwan Apr 4, 2023
8231de0
fix javadoc
siddhantsangwan Apr 4, 2023
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
7 changes: 5 additions & 2 deletions ...ava/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerSelectionCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ public NavigableSet<ContainerID> getCandidateContainers(
* @param second second container to compare
* @return An integer greater than 0 if first is more used, 0 if they're
* the same containers or a container is not found, and a value less than 0
* if first is not more used than second.
* if first is less used than second. If both containers have equal used
* space, they're compared using {@link ContainerID#compareTo(ContainerID)}.
*/
private int isContainerMoreUsed(ContainerID first,
ContainerID second) {
Expand All @@ -132,8 +133,10 @@ private int isContainerMoreUsed(ContainerID first,
ContainerInfo secondInfo = containerManager.getContainer(second);
if (firstInfo.getUsedBytes() > secondInfo.getUsedBytes()) {
return 1;
} else {
} else if (firstInfo.getUsedBytes() < secondInfo.getUsedBytes()) {
return -1;
} else {
return first.compareTo(second);
}
} catch (ContainerNotFoundException e) {
LOG.warn("Could not retrieve ContainerInfo from container manager for " +
Expand Down
5 changes: 4 additions & 1 deletion ...rc/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,14 +1163,17 @@ private void createReplicasForContainers() {

// randomly pick a datanode for this replica
int datanodeIndex = RANDOM.nextInt(0, numberOfNodes);
if (nodeUtilizations.get(i) != 0.0d) {
// don't put replicas in DNs that are supposed to have 0 utilization
if (Math.abs(nodeUtilizations.get(datanodeIndex) - 0.0d) > 0.00001) {
DatanodeDetails node =
nodesInCluster.get(datanodeIndex).getDatanodeDetails();
Set<ContainerReplica> replicas =
cidToReplicasMap.get(container.containerID());
replicas.add(createReplica(container.containerID(), node,
container.getUsedBytes()));
cidToReplicasMap.put(container.containerID(), replicas);
datanodeToContainersMap.get(nodesInCluster.get(datanodeIndex))
.add(container.containerID());
}
}
}
Expand Down