From 47ecc90e56a0dc98f52ad089e4dfda4c47013c9b Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Thu, 27 Mar 2014 17:38:09 +0000 Subject: [PATCH] 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 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 6b37993ac2a..b9188380d26 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -481,6 +481,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) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm index 31630fc8500..3a34dffb682 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm @@ -802,7 +802,7 @@ digest:hdfs-zkfcs:vlUvLnd8MlacsE80rDuu6ONESbM=:rwcda or rolling back the upgrade, you should start the NNs as normal, i.e. without any special startup flag. - <>, the operator will use the <<<`hdfsadmin + <>, 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