big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-6215. Wrong error message for upgrade. (Kihwal Lee via jeagles)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586011 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Turner Eagles 2014-04-09 16:20:26 +00:00
parent 6cc92bf8fc
commit 58d49cecd5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,6 +332,8 @@ Release 2.4.1 - UNRELEASED
IMPROVEMENTS IMPROVEMENTS
HDFS-6215. Wrong error message for upgrade. (Kihwal Lee via jeagles)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

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

@ -229,7 +229,8 @@ boolean recoverTransitionRead(StartupOption startOpt, FSNamesystem target,
+ RollingUpgradeStartupOption.STARTED.getOptionString() + RollingUpgradeStartupOption.STARTED.getOptionString()
+ "\" option if a rolling upgraded is already started;" + "\" option if a rolling upgraded is already started;"
+ " or restart NameNode with the \"" + " or restart NameNode with the \""
+ StartupOption.UPGRADE + "\" to start a new upgrade."); + StartupOption.UPGRADE.getName() + "\" option to start"
+ " a new upgrade.");
} }
storage.processStartupOptionsForUpgrade(startOpt, layoutVersion); storage.processStartupOptionsForUpgrade(startOpt, layoutVersion);