You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by av...@apache.org on 2021/11/29 22:54:14 UTC
[ozone] branch master updated: HDDS-5804. SCMContainerPlacementCapacity to choose lower utilized node (#2784)
This is an automated email from the ASF dual-hosted git repository.
avijayan 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 8b4d4a9 HDDS-5804. SCMContainerPlacementCapacity to choose lower utilized node (#2784)
8b4d4a9 is described below
commit 8b4d4a9c0421f68d8388f43496bf481eb59d8c62
Author: Aswin Shakil Balasubramanian <as...@gmail.com>
AuthorDate: Mon Nov 29 14:53:48 2021 -0800
HDDS-5804. SCMContainerPlacementCapacity to choose lower utilized node (#2784)
---
.../placement/algorithms/SCMContainerPlacementCapacity.java | 2 +-
.../java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java | 6 ++++--
.../placement/algorithms/TestSCMContainerPlacementCapacity.java | 6 +++---
.../hadoop/ozone/container/placement/TestContainerPlacement.java | 4 ++--
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementCapacity.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementCapacity.java
index afb9e1b..1128d17 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementCapacity.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementCapacity.java
@@ -135,7 +135,7 @@ public final class SCMContainerPlacementCapacity
getNodeManager().getNodeStat(firstNodeDetails);
SCMNodeMetric secondNodeMetric =
getNodeManager().getNodeStat(secondNodeDetails);
- datanodeDetails = firstNodeMetric.isGreater(secondNodeMetric.get())
+ datanodeDetails = !firstNodeMetric.isGreater(secondNodeMetric.get())
? firstNodeDetails : secondNodeDetails;
}
healthyNodes.remove(datanodeDetails);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
index f0ecd78..83a6b62 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
@@ -750,7 +750,8 @@ public class MockNodeManager implements NodeManager {
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);
}
@@ -766,7 +767,8 @@ public class MockNodeManager implements NodeManager {
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);
}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java
index ae30402..bc88e97 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java
@@ -148,10 +148,10 @@ public class TestSCMContainerPlacementCapacity {
}
- //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)));
}
}
\ No newline at end of file
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/placement/TestContainerPlacement.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/placement/TestContainerPlacement.java
index 5ec7db6..f1870e0 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/placement/TestContainerPlacement.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/placement/TestContainerPlacement.java
@@ -85,8 +85,8 @@ public class TestContainerPlacement {
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org