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 zj...@apache.org on 2015/05/09 02:41:56 UTC
[02/50] hadoop git commit: HDFS-8226. Non-HA rollback compatibility
broken (Contributed by J.Andreina)
HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cd987dc1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cd987dc1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cd987dc1
Branch: refs/heads/YARN-2928
Commit: cd987dc11977cdaa0211738e14e0c97160866c30
Parents: 727be9a
Author: Vinayakumar B <vi...@apache.org>
Authored: Fri May 8 15:24:36 2015 +0530
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri May 8 17:32:45 2015 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh | 7 ++++---
.../hadoop-hdfs/src/site/markdown/HdfsUserGuide.md | 2 ++
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cd987dc1/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 82e0799..e1717e8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -755,6 +755,8 @@ Release 2.7.1 - UNRELEASED
HDFS-7980. Incremental BlockReport will dramatically slow down namenode
startup. (Walter Su via szetszwo)
+ HDFS-8226. Non-HA rollback compatibility broken (J.Andreina via vinayakumarb)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cd987dc1/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
index 5799dec..275c1c0 100755
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
@@ -48,13 +48,14 @@ fi
# get arguments
if [[ $# -ge 1 ]]; then
- nameStartOpt="$1"
+ startOpt="$1"
shift
- case "$nameStartOpt" in
+ case "$startOpt" in
-upgrade)
+ nameStartOpt="$startOpt"
;;
-rollback)
- dataStartOpt="$nameStartOpt"
+ dataStartOpt="$startOpt"
;;
*)
hadoop_exit_with_usage 1
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cd987dc1/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
index a9692a8..24af67b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
@@ -318,6 +318,8 @@ When Hadoop is upgraded on an existing cluster, as with any software upgrade, it
* stop the cluster and distribute earlier version of Hadoop.
+ * run the rollback command on the namenode (`bin/hdfs namenode -rollback`).
+
* start the cluster with rollback option. (`sbin/start-dfs.sh -rollback`).
When upgrading to a new version of HDFS, it is necessary to rename or delete any paths that are reserved in the new version of HDFS. If the NameNode encounters a reserved path during upgrade, it will print an error like the following: