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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586011 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 16:20:26 +00:00 · 2014-04-09 16:20:26 +00:00 · 58d49cecd5
commit 58d49cecd5
parent 6cc92bf8fc
2 changed files with 4 additions and 1 deletions
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@ -332,6 +332,8 @@ Release 2.4.1 - UNRELEASED

  IMPROVEMENTS

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

  BUG FIXES 
--- 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
@ -229,7 +229,8 @@ boolean recoverTransitionRead(StartupOption startOpt, FSNamesystem target,
          + RollingUpgradeStartupOption.STARTED.getOptionString()
          + "\" option if a rolling upgraded is already started;"
          + " 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);