Skip to content

HDDS-5804. SCMContainerPlacementCapacity to choose lower utilized node #2784

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
avijayanhwx merged 3 commits into from
Nov 29, 2021
Merged

HDDS-5804. SCMContainerPlacementCapacity to choose lower utilized node #2784

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
0e41c83
HDDS-5804. SCMContainerPlacementCapacity to choose lower utilized node
aswinshakil Oct 29, 2021
7f10525
HDDS-5804. Fixed Tests.
aswinshakil Nov 18, 2021
32803a2
Trigger Build
aswinshakil Nov 23, 2021
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
2 changes: 1 addition & 1 deletion .../apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementCapacity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public DatanodeDetails chooseNode(List<DatanodeDetails> healthyNodes) {
getNodeManager().getNodeStat(firstNodeDetails);
SCMNodeMetric secondNodeMetric =
getNodeManager().getNodeStat(secondNodeDetails);
datanodeDetails = firstNodeMetric.isGreater(secondNodeMetric.get())
datanodeDetails = !firstNodeMetric.isGreater(secondNodeMetric.get())
? firstNodeDetails : secondNodeDetails;
}
healthyNodes.remove(datanodeDetails);
Expand Down
6 changes: 4 additions & 2 deletions ...p-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,8 @@ public void addContainer(DatanodeDetails datanodeDetails, long size) {
SCMNodeStat stat = this.nodeMetricMap.get(datanodeDetails);
if (stat != null) {
aggregateStat.subtract(stat);
stat.getCapacity().add(size);
stat.getScmUsed().add(size);
stat.getRemaining().subtract(size);
aggregateStat.add(stat);
nodeMetricMap.put(datanodeDetails, stat);
}
Expand All @@ -766,7 +767,8 @@ public void delContainer(DatanodeDetails datanodeDetails, long size) {
SCMNodeStat stat = this.nodeMetricMap.get(datanodeDetails);
if (stat != null) {
aggregateStat.subtract(stat);
stat.getCapacity().subtract(size);
stat.getScmUsed().subtract(size);
stat.getRemaining().add(size);
aggregateStat.add(stat);
nodeMetricMap.put(datanodeDetails, stat);
}
Expand Down
6 changes: 3 additions & 3 deletions ...che/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ public void chooseDatanodes() throws SCMException {

}

//datanode 4 has less space. Should be selected less times.
Assert.assertTrue(selectedCount.get(datanodes.get(3)) > selectedCount
//datanode 6 has more space than datanode 3 and datanode 4.
Assert.assertTrue(selectedCount.get(datanodes.get(3)) < selectedCount
.get(datanodes.get(6)));
Assert.assertTrue(selectedCount.get(datanodes.get(4)) > selectedCount
Assert.assertTrue(selectedCount.get(datanodes.get(4)) < selectedCount
.get(datanodes.get(6)));
}
}
4 changes: 2 additions & 2 deletions ...scm/src/test/java/org/apache/hadoop/ozone/container/placement/TestContainerPlacement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ public void testCapacityPlacementYieldsBetterDataDistribution() throws
null, true, null);

for (int x = 0; x < opsCount; x++) {
long containerSize = random.nextInt(100) * OzoneConsts.GB;
long metadataSize = random.nextInt(100) * OzoneConsts.GB;
long containerSize = random.nextInt(10) * OzoneConsts.GB;
long metadataSize = random.nextInt(10) * OzoneConsts.GB;
List<DatanodeDetails> nodesCapacity =
capacityPlacer.chooseDatanodes(new ArrayList<>(), null, nodesRequired,
metadataSize, containerSize);
Expand Down