Repository: hadoop Updated Branches: refs/heads/branch-2.8 9afa321fd -> 58d4c045e refs/heads/trunk 33ce7f6c0 -> 9b959f3ee
HDFS-9790. HDFS Balancer should exit with a proper message if upgrade is not finalized (Contributed by Xiaobing Zhou) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9b959f3e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9b959f3e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9b959f3e Branch: refs/heads/trunk Commit: 9b959f3ee70cfdaf532d72f0bbbd1a4be0be12aa Parents: 33ce7f6 Author: Arpit Agarwal <[email protected]> Authored: Thu Feb 11 20:40:03 2016 -0800 Committer: Arpit Agarwal <[email protected]> Committed: Thu Feb 11 20:40:03 2016 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/balancer/Balancer.java | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b959f3e/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 73a09d6..c0d7113 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2739,6 +2739,9 @@ Release 2.8.0 - UNRELEASED HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto. (wang) + HDFS-9790. HDFS Balancer should exit with a proper message if upgrade is + not finalized. (Xiaobing Zhou via Arpit Agarwal) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b959f3e/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 927fb7f..191e1c3 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 @@ -586,6 +586,8 @@ public class Balancer { // Should not run the balancer during an unfinalized upgrade, since moved // blocks are not deleted on the source datanode. if (!runDuringUpgrade && nnc.isUpgrading()) { + System.err.println("Balancer exiting as upgrade is not finalized, " + + "please finalize the HDFS upgrade before running the balancer."); return newResult(ExitStatus.UNFINALIZED_UPGRADE, bytesLeftToMove, -1); }
