From b2f4e53e2bf1808762669628fb9cdbc13beb4790 Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Thu, 22 May 2014 04:38:20 +0000 Subject: [PATCH] HDFS-6409. Fix typo in log message about NameNode layout version upgrade. Contributed by Chen He. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1596739 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/namenode/FSImage.java | 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 93342653f6..25ef583032 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -572,6 +572,9 @@ Release 2.5.0 - UNRELEASED HDFS-6419. TestBookKeeperHACheckpoints#TestSBNCheckpoints fails on trunk. (Akira AJISAKA via kihwal) + HDFS-6409. Fix typo in log message about NameNode layout version upgrade. + (Chen He via cnauroth) + Release 2.4.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java index 36028a0283..b163579f0c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java @@ -227,7 +227,7 @@ boolean recoverTransitionRead(StartupOption startOpt, FSNamesystem target, + HdfsConstants.NAMENODE_LAYOUT_VERSION + " is required.\n" + "Please restart NameNode with the \"" + RollingUpgradeStartupOption.STARTED.getOptionString() - + "\" option if a rolling upgraded is already started;" + + "\" option if a rolling upgrade is already started;" + " or restart NameNode with the \"" + StartupOption.UPGRADE.getName() + "\" option to start" + " a new upgrade.");