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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1586021 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

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

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

@@ -229,7 +229,8 @@ public class FSImage implements Closeable {
           + 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);