HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina)

(cherry picked from commit e01c1a979c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
	hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md

(cherry picked from commit 3a894b4563)
This commit is contained in:
Vinayakumar B 2015-05-08 15:24:36 +05:30
parent ada2f74b17
commit 99309a9fec
3 changed files with 19 additions and 15 deletions

View File

@ -68,6 +68,8 @@ Release 2.7.1 - UNRELEASED
HDFS-7980. Incremental BlockReport will dramatically slow down namenode HDFS-7980. Incremental BlockReport will dramatically slow down namenode
startup. (Walter Su via szetszwo) startup. (Walter Su via szetszwo)
HDFS-8226. Non-HA rollback compatibility broken (J.Andreina via vinayakumarb)
Release 2.7.0 - 2015-04-20 Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -30,18 +30,18 @@ HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
. $HADOOP_LIBEXEC_DIR/hdfs-config.sh . $HADOOP_LIBEXEC_DIR/hdfs-config.sh
# get arguments # get arguments
if [ $# -ge 1 ]; then if [[ $# -ge 1 ]]; then
nameStartOpt="$1" startOpt="$1"
shift shift
case "$nameStartOpt" in case "$startOpt" in
(-upgrade) -upgrade)
nameStartOpt="$startOpt"
;; ;;
(-rollback) -rollback)
dataStartOpt="$nameStartOpt" dataStartOpt="$startOpt"
;; ;;
(*) *)
echo $usage hadoop_exit_with_usage 1
exit 1
;; ;;
esac esac
fi fi

View File

@ -319,7 +319,9 @@ When Hadoop is upgraded on an existing cluster, as with any software upgrade, it
* stop the cluster and distribute earlier version of Hadoop. * stop the cluster and distribute earlier version of Hadoop.
* start the cluster with rollback option. (`bin/start-dfs.sh -rollback`). * 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: 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: