HDFS-9761. Rebalancer sleeps too long between iterations. Contributed by Mingliang Liu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c6497949 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c6497949 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c6497949 Branch: refs/heads/yarn-2877 Commit: c6497949e866594050153b953a85c0a1db59d2f8 Parents: a37e423 Author: cnauroth <cnaur...@apache.org> Authored: Fri Feb 5 15:07:43 2016 -0800 Committer: cnauroth <cnaur...@apache.org> Committed: Fri Feb 5 15:07:43 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/c6497949/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 44cbcc5..80be323 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2704,6 +2704,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/c6497949/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 2bd28ab..927fb7f 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 @@ -674,14 +674,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) {
