This is an automated email from the ASF dual-hosted git repository.

huhaiyang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new eb1e30395b3 HDFS-17644:Add log when a node selection is rejected by 
BPP UpgradeDomain (#7109)
eb1e30395b3 is described below

commit eb1e30395b3b413d8366653ba7269f20174bc81b
Author: Lei Yang <ley...@linkedin.com>
AuthorDate: Sat Oct 26 02:29:43 2024 -0700

    HDFS-17644:Add log when a node selection is rejected by BPP UpgradeDomain 
(#7109)
---
 .../hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java   | 7 ++++---
 .../blockmanagement/BlockPlacementPolicyWithUpgradeDomain.java     | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
index 8020d7c45b3..0958aaf5b81 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
@@ -80,7 +80,7 @@ public class BlockPlacementPolicyDefault extends 
BlockPlacementPolicy {
   private static final BlockPlacementStatus ONE_RACK_PLACEMENT =
       new BlockPlacementStatusDefault(1, 1, 1);
 
-  private enum NodeNotChosenReason {
+  protected enum NodeNotChosenReason {
     NOT_IN_SERVICE("the node is not in service"),
     NODE_STALE("the node is stale"),
     NODE_TOO_BUSY("the node is too busy"),
@@ -88,7 +88,8 @@ public class BlockPlacementPolicyDefault extends 
BlockPlacementPolicy {
     TOO_MANY_NODES_ON_RACK("the rack has too many chosen nodes"),
     NOT_ENOUGH_STORAGE_SPACE("not enough storage space to place the block"),
     NO_REQUIRED_STORAGE_TYPE("required storage types are unavailable"),
-    NODE_SLOW("the node is too slow");
+    NODE_SLOW("the node is too slow"),
+    NODE_NOT_CONFORM_TO_UD("the node doesn't conform to upgrade domain 
policy");
 
     private final String text;
 
@@ -980,7 +981,7 @@ public class BlockPlacementPolicyDefault extends 
BlockPlacementPolicy {
     logNodeIsNotChosen(node, reason, null);
   }
 
-  private static void logNodeIsNotChosen(DatanodeDescriptor node,
+  protected static void logNodeIsNotChosen(DatanodeDescriptor node,
       NodeNotChosenReason reason, String reasonDetails) {
     assert reason != null;
     if (LOG.isDebugEnabled()) {
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyWithUpgradeDomain.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyWithUpgradeDomain.java
index 37fb9714858..5ff9865cb5a 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyWithUpgradeDomain.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyWithUpgradeDomain.java
@@ -74,6 +74,9 @@ public class BlockPlacementPolicyWithUpgradeDomain extends
         Set<String> upgradeDomains = getUpgradeDomains(results);
         if (upgradeDomains.contains(node.getUpgradeDomain())) {
           isGoodTarget = false;
+          logNodeIsNotChosen(node, NodeNotChosenReason.NODE_NOT_CONFORM_TO_UD,
+              "(The node's upgrade domain: " + node.getUpgradeDomain() +
+                  " is already chosen)");
         }
       }
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to