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

HDFS-6409. Merging change r1596739 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596740 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2014-05-22 04:43:59 +00:00
parent e4f164245a
commit c362382259
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

@ -257,6 +257,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6419. TestBookKeeperHACheckpoints#TestSBNCheckpoints fails on trunk. HDFS-6419. TestBookKeeperHACheckpoints#TestSBNCheckpoints fails on trunk.
(Akira AJISAKA via kihwal) (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 Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
View File

@ -227,7 +227,7 @@ boolean recoverTransitionRead(StartupOption startOpt, FSNamesystem target,
+ HdfsConstants.NAMENODE_LAYOUT_VERSION + " is required.\n" + HdfsConstants.NAMENODE_LAYOUT_VERSION + " is required.\n"
+ "Please restart NameNode with the \"" + "Please restart NameNode with the \""
+ RollingUpgradeStartupOption.STARTED.getOptionString() + RollingUpgradeStartupOption.STARTED.getOptionString()
+ "\" option if a rolling upgraded is already started;" + "\" option if a rolling upgrade is already started;"
+ " or restart NameNode with the \"" + " or restart NameNode with the \""
+ StartupOption.UPGRADE.getName() + "\" option to start" + StartupOption.UPGRADE.getName() + "\" option to start"
+ " a new upgrade."); + " a new upgrade.");