hadoop git commit: HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina)
Repository: hadoop Updated Branches: refs/heads/trunk 2401ff76b - e01c1a979 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/e01c1a97 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e01c1a97 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e01c1a97 Branch: refs/heads/trunk Commit: e01c1a979cbc8fb398d5b7a46693657bc2668a58 Parents: 2401ff7 Author: Vinayakumar B vinayakum...@apache.org Authored: Fri May 8 15:24:36 2015 +0530 Committer: Vinayakumar B vinayakum...@apache.org Committed: Fri May 8 15:24:36 2015 +0530 -- 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/e01c1a97/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/e01c1a97/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/e01c1a97/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:
hadoop git commit: HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 ade5165ec - 3a894b456
HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina)
(cherry picked from commit e01c1a979cbc8fb398d5b7a46693657bc2668a58)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3a894b45
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3a894b45
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3a894b45
Branch: refs/heads/branch-2
Commit: 3a894b45635d6528bb4c29953f57bd418a7c8a80
Parents: ade5165
Author: Vinayakumar B vinayakum...@apache.org
Authored: Fri May 8 15:24:36 2015 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Fri May 8 15:34:17 2015 +0530
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
.../hadoop-hdfs/src/main/bin/start-dfs.sh | 28 ++--
.../src/site/markdown/HdfsUserGuide.md | 4 ++-
3 files changed, 19 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a894b45/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 f1eb24d..2b6f476 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -428,6 +428,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/3a894b45/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 8cbea16..c46e625 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
@@ -30,20 +30,20 @@
HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
# get arguments
-if [ $# -ge 1 ]; then
- nameStartOpt=$1
- shift
- case $nameStartOpt in
- (-upgrade)
- ;;
- (-rollback)
- dataStartOpt=$nameStartOpt
- ;;
- (*)
- echo $usage
- exit 1
- ;;
- esac
+if [[ $# -ge 1 ]]; then
+ startOpt=$1
+ shift
+ case $startOpt in
+-upgrade)
+ nameStartOpt=$startOpt
+;;
+-rollback)
+ dataStartOpt=$startOpt
+;;
+*)
+ hadoop_exit_with_usage 1
+;;
+ esac
fi
#Add other possible options
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a894b45/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 f80c1f6..9c6bd02 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
@@ -318,7 +318,9 @@ When Hadoop is upgraded on an existing cluster, as with any
software upgrade, it
* 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:
[1/2] hadoop git commit: HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 ada2f74b1 - 1fbefe586
HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina)
(cherry picked from commit e01c1a979cbc8fb398d5b7a46693657bc2668a58)
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 3a894b45635d6528bb4c29953f57bd418a7c8a80)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/99309a9f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/99309a9f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/99309a9f
Branch: refs/heads/branch-2.7
Commit: 99309a9fecbd2d17e525f6989c936ee6d0bbaeb9
Parents: ada2f74
Author: Vinayakumar B vinayakum...@apache.org
Authored: Fri May 8 15:24:36 2015 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Fri May 8 15:42:02 2015 +0530
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
.../hadoop-hdfs/src/main/bin/start-dfs.sh | 28 ++--
.../src/site/markdown/HdfsUserGuide.md | 4 ++-
3 files changed, 19 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/99309a9f/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 eaade89..bdb3032 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -68,6 +68,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/99309a9f/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 8cbea16..c46e625 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
@@ -30,20 +30,20 @@
HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
# get arguments
-if [ $# -ge 1 ]; then
- nameStartOpt=$1
- shift
- case $nameStartOpt in
- (-upgrade)
- ;;
- (-rollback)
- dataStartOpt=$nameStartOpt
- ;;
- (*)
- echo $usage
- exit 1
- ;;
- esac
+if [[ $# -ge 1 ]]; then
+ startOpt=$1
+ shift
+ case $startOpt in
+-upgrade)
+ nameStartOpt=$startOpt
+;;
+-rollback)
+ dataStartOpt=$startOpt
+;;
+*)
+ hadoop_exit_with_usage 1
+;;
+ esac
fi
#Add other possible options
http://git-wip-us.apache.org/repos/asf/hadoop/blob/99309a9f/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 37fa4be..c43c63c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
@@ -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.
-* 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:
[2/2] hadoop git commit: HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina) Added one missed change, missed while resolving conflict
HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina) Added one missed change, missed while resolving conflict (cherry picked from commit 3ee1b50dad9604bd959adbae472813f4bdf2fec7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1fbefe58 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1fbefe58 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1fbefe58 Branch: refs/heads/branch-2.7 Commit: 1fbefe586b35e581f2c4610cd8e010e27e782bc3 Parents: 99309a9 Author: Vinayakumar B vinayakum...@apache.org Authored: Fri May 8 15:39:47 2015 +0530 Committer: Vinayakumar B vinayakum...@apache.org Committed: Fri May 8 15:42:17 2015 +0530 -- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1fbefe58/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 c46e625..a8c2b98 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 @@ -41,7 +41,8 @@ if [[ $# -ge 1 ]]; then dataStartOpt=$startOpt ;; *) - hadoop_exit_with_usage 1 + echo $usage + exit 1 ;; esac fi
[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 vinayakum...@apache.org Authored: Fri May 8 15:24:36 2015 +0530 Committer: Zhijie Shen zjs...@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:
