diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 6145c5dac39..cab4a426cc5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -297,6 +297,8 @@ Trunk (Unreleased) HDFS-4261. Fix bugs in Balaner causing infinite loop and TestBalancerWithNodeGroup timeing out. (Junping Du via szetszwo) + HDFS-4382. Fix typo MAX_NOT_CHANGED_INTERATIONS. (Ted Yu via suresh) + Release 2.0.3-alpha - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java index 049e6691913..b64844ba523 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java @@ -190,7 +190,7 @@ public class Balancer { * balancing purpose at a datanode */ public static final int MAX_NUM_CONCURRENT_MOVES = 5; - public static final int MAX_NO_PENDING_BLOCK_INTERATIONS = 5; + private static final int MAX_NO_PENDING_BLOCK_ITERATIONS = 5; private static final String USAGE = "Usage: java " + Balancer.class.getSimpleName() @@ -782,7 +782,7 @@ public class Balancer { noPendingBlockIteration++; // in case no blocks can be moved for source node's task, // jump out of while-loop after 5 iterations. - if (noPendingBlockIteration >= MAX_NO_PENDING_BLOCK_INTERATIONS) { + if (noPendingBlockIteration >= MAX_NO_PENDING_BLOCK_ITERATIONS) { scheduledSize = 0; } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java index 530a3b7e781..afec92be611 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java @@ -52,7 +52,7 @@ import org.apache.hadoop.util.Daemon; class NameNodeConnector { private static final Log LOG = Balancer.LOG; private static final Path BALANCER_ID_PATH = new Path("/system/balancer.id"); - private static final int MAX_NOT_CHANGED_INTERATIONS = 5; + private static final int MAX_NOT_CHANGED_ITERATIONS = 5; final URI nameNodeUri; final String blockpoolID; @@ -127,7 +127,7 @@ class NameNodeConnector { notChangedIterations = 0; } else { notChangedIterations++; - if (notChangedIterations >= MAX_NOT_CHANGED_INTERATIONS) { + if (notChangedIterations >= MAX_NOT_CHANGED_ITERATIONS) { System.out.println("No block has been moved for " + notChangedIterations + " iterations. Exiting..."); return false;