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

HDFS-7176. The namenode usage message doesn't include "-rollingupgrade started" (cmccabe) 

(cherry picked from commit dd1b8f2ed8)
This commit is contained in:
Colin Patrick Mccabe 2014-10-01 14:53:44 -07:00
parent 63ad22be48
commit 1725d56132
2 changed files with 5 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

@ -539,6 +539,9 @@ Release 2.6.0 - UNRELEASED
HDFS-7172. Test data files may be checked out of git with incorrect line HDFS-7172. Test data files may be checked out of git with incorrect line
endings, causing test failures in TestHDFSCLI. (Chris Nauroth via wheat9) endings, causing test failures in TestHDFSCLI. (Chris Nauroth via wheat9)
HDFS-7176. The namenode usage message doesn't include "-rollingupgrade
started" (cmccabe)
BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
HDFS-6387. HDFS CLI admin tool for creating & deleting an HDFS-6387. HDFS CLI admin tool for creating & deleting an

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

@ -217,7 +217,8 @@ public class NameNode implements NameNodeStatusMXBean {
+ StartupOption.ROLLBACK.getName() + "] | \n\t[" + StartupOption.ROLLBACK.getName() + "] | \n\t["
+ StartupOption.ROLLINGUPGRADE.getName() + " <" + StartupOption.ROLLINGUPGRADE.getName() + " <"
+ RollingUpgradeStartupOption.DOWNGRADE.name().toLowerCase() + "|" + RollingUpgradeStartupOption.DOWNGRADE.name().toLowerCase() + "|"
+ RollingUpgradeStartupOption.ROLLBACK.name().toLowerCase() + "> ] | \n\t[" + RollingUpgradeStartupOption.ROLLBACK.name().toLowerCase() + "|"
+ RollingUpgradeStartupOption.STARTED.name().toLowerCase() + "> ] | \n\t["
+ StartupOption.FINALIZE.getName() + "] | \n\t[" + StartupOption.FINALIZE.getName() + "] | \n\t["
+ StartupOption.IMPORT.getName() + "] | \n\t[" + StartupOption.IMPORT.getName() + "] | \n\t["
+ StartupOption.INITIALIZESHAREDEDITS.getName() + "] | \n\t[" + StartupOption.INITIALIZESHAREDEDITS.getName() + "] | \n\t["