Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-6163. Merge change r1582421 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582422 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jing Zhao 2014-03-27 17:38:09 +00:00
parent 88dc6c1ed3
commit 47ecc90e56
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -481,6 +481,9 @@ Release 2.4.0 - UNRELEASED
HDFS-6157. Fix the entry point of OfflineImageViewer for hdfs.cmd. (wheat9) 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 BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

2
hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm
View File

@ -802,7 +802,7 @@ digest:hdfs-zkfcs:vlUvLnd8MlacsE80rDuu6ONESbM=:rwcda
or rolling back the upgrade, you should start the NNs as normal, i.e. without or rolling back the upgrade, you should start the NNs as normal, i.e. without
any special startup flag. 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 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 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 of the shared log, and the NN whose local storage directories contain the