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 6a129ac181 HDDS-10198. Improve logging in AbstractFindTargetGreedy
(#6090)
6a129ac181 is described below
commit 6a129ac1815c9c84bfd17ab31671f62accc75e75
Author: Siddhant Sangwan <[email protected]>
AuthorDate: Thu Jan 25 22:24:17 2024 +0530
HDDS-10198. Improve logging in AbstractFindTargetGreedy (#6090)
---
.../hdds/scm/container/balancer/AbstractFindTargetGreedy.java | 3 +++
.../scm/container/balancer/FindTargetGreedyByNetworkTopology.java | 5 ++++-
.../hdds/scm/container/balancer/FindTargetGreedyByUsageInfo.java | 6 +++++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/AbstractFindTargetGreedy.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/AbstractFindTargetGreedy.java
index 660452b2d8..eb422f13b1 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/AbstractFindTargetGreedy.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/AbstractFindTargetGreedy.java
@@ -228,6 +228,9 @@ public abstract class AbstractFindTargetGreedy implements
FindTargetStrategy {
if (totalEnteringSize < config.getMaxSizeEnteringTarget()) {
//reorder
potentialTargets.add(nodeManager.getUsageInfo(target));
+ } else {
+ logger.debug("Datanode {} removed from the list of potential targets.
The total size of data entering it in " +
+ "this iteration is {}.", target, totalEnteringSize);
}
return;
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByNetworkTopology.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByNetworkTopology.java
index 87feae4981..9085c27475 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByNetworkTopology.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByNetworkTopology.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.hdds.scm.net.NetworkTopology;
import org.apache.hadoop.hdds.scm.node.DatanodeUsageInfo;
import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
@@ -41,6 +42,8 @@ import java.util.List;
*/
public class FindTargetGreedyByNetworkTopology
extends AbstractFindTargetGreedy {
+ public static final Logger LOG =
+ LoggerFactory.getLogger(FindTargetGreedyByNetworkTopology.class);
private NetworkTopology networkTopology;
private List potentialTargets;
@@ -51,7 +54,7 @@ public class FindTargetGreedyByNetworkTopology
NodeManager nodeManager,
NetworkTopology networkTopology) {
super(containerManager, placementPolicyValidateProxy, nodeManager);
-
setLogger(LoggerFactory.getLogger(FindTargetGreedyByNetworkTopology.class));
+ setLogger(LOG);
potentialTargets = new LinkedList<>();
setPotentialTargets(potentialTargets);
this.networkTopology = networkTopology;
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByUsageInfo.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByUsageInfo.java
index 71a338db92..f6a9ca9c47 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByUsageInfo.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByUsageInfo.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.hdds.scm.container.ContainerManager;
import org.apache.hadoop.hdds.scm.node.DatanodeUsageInfo;
import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
@@ -37,12 +38,15 @@ import java.util.TreeSet;
* target with the lowest space usage.
*/
public class FindTargetGreedyByUsageInfo extends AbstractFindTargetGreedy {
+ public static final Logger LOG =
+ LoggerFactory.getLogger(FindTargetGreedyByUsageInfo.class);
+
public FindTargetGreedyByUsageInfo(
ContainerManager containerManager,
PlacementPolicyValidateProxy placementPolicyValidateProxy,
NodeManager nodeManager) {
super(containerManager, placementPolicyValidateProxy, nodeManager);
- setLogger(LoggerFactory.getLogger(FindTargetGreedyByUsageInfo.class));
+ setLogger(LOG);
setPotentialTargets(new TreeSet<>((a, b) -> compareByUsage(a, b)));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
