Author: jing9
Date: Thu Mar 27 17:39:27 2014
New Revision: 1582423
URL: http://svn.apache.org/r1582423
Log:
HDFS-6163. Merge change r1582422 from branch-2.
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1582423&r1=1582422&r2=1582423&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Mar 27 17:39:27 2014
@@ -441,6 +441,9 @@ Release 2.4.0 - UNRELEASED
HDFS-6157. Fix the entry point of OfflineImageViewer for hdfs.cmd. (wheat9)
+ HDFS-6163. Fix a minor bug in the HA upgrade document. (Fengdong Yu via
+ jing9)
+
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm?rev=1582423&r1=1582422&r2=1582423&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm
Thu Mar 27 17:39:27 2014
@@ -802,7 +802,7 @@ digest:hdfs-zkfcs:vlUvLnd8MlacsE80rDuu6O
or rolling back the upgrade, you should start the NNs as normal, i.e. without
any special startup flag.
- <<To finalize an HA upgrade>>, the operator will use the <<<`hdfsadmin
+ <<To finalize an HA upgrade>>, the operator will use the <<<`hdfs
dfsadmin -finalizeUpgrade'>>> command while the NNs are running and one of
them
is active. The active NN at the time this happens will perform the
finalization
of the shared log, and the NN whose local storage directories contain the
