HDFS-9761. Rebalancer sleeps too long between iterations. Contributed by Mingliang Liu.
(cherry picked from commit c6497949e866594050153b953a85c0a1db59d2f8) (cherry picked from commit a7232f5e1d20faf210f3718c551cbae4edb5933c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bad8006d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bad8006d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bad8006d Branch: refs/heads/branch-2.8 Commit: bad8006da1a544560ad564465d7fa8e4dd1f8311 Parents: e01d839 Author: cnauroth <[email protected]> Authored: Fri Feb 5 15:07:43 2016 -0800 Committer: cnauroth <[email protected]> Committed: Fri Feb 5 15:08:07 2016 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/balancer/Balancer.java | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bad8006d/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 0e1ae4b..ccd8321 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1721,6 +1721,9 @@ Release 2.8.0 - UNRELEASED HDFS-9601. NNThroughputBenchmark.BlockReportStats should handle NotReplicatedYetException on adding block (iwasakims) + HDFS-9761. Rebalancer sleeps too long between iterations + (Mingliang Liu via cnauroth) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/bad8006d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java ---------------------------------------------------------------------- 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 dcae922..8be62ac 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 @@ -673,14 +673,13 @@ public class Balancer { // must be an error statue, return. return r.exitStatus.getExitCode(); } - - if (!done) { - Thread.sleep(sleeptime); - } } else { LOG.info("Skipping blockpool " + nnc.getBlockpoolID()); } } + if (!done) { + Thread.sleep(sleeptime); + } } } finally { for(NameNodeConnector nnc : connectors) {
