You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2016/02/12 05:43:29 UTC
[2/2] hadoop git commit: HDFS-9790. HDFS Balancer should exit with a
proper message if upgrade is not finalized (Contributed by Xiaobing Zhou)
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/58d4c045
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58d4c045
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58d4c045
Branch: refs/heads/branch-2.8
Commit: 58d4c045e667d1dea0e3c9218baf00011faff785
Parents: 9afa321
Author: Arpit Agarwal <ar...@apache.org>
Authored: Thu Feb 11 20:40:03 2016 -0800
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Thu Feb 11 20:40:49 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/58d4c045/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 2942823..559a353 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1743,6 +1743,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/58d4c045/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 8be62ac..60e70f4 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
@@ -585,6 +585,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);
}