hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmcc...@apache.org
Subject git commit: HDFS-7176. The namenode usage message doesn't include "-rollingupgrade started" (cmccabe) (cherry picked from commit dd1b8f2ed8a86871517c730a9f370aca4b763514) (cherry picked from commit 1725d56132c54d9ccab9e25b1ea5ad5c04c43795)
Date Thu, 02 Oct 2014 21:08:22 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6 94277a7d2 -> cf025cc39


HDFS-7176. The namenode usage message doesn't include "-rollingupgrade started" (cmccabe)
(cherry picked from commit dd1b8f2ed8a86871517c730a9f370aca4b763514)
(cherry picked from commit 1725d56132c54d9ccab9e25b1ea5ad5c04c43795)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cf025cc3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cf025cc3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cf025cc3

Branch: refs/heads/branch-2.6
Commit: cf025cc39bcb5329179541ec4ec2c011e3749cc8
Parents: 94277a7
Author: Colin Patrick Mccabe <cmccabe@cloudera.com>
Authored: Wed Oct 1 14:53:44 2014 -0700
Committer: Colin Patrick Mccabe <cmccabe@cloudera.com>
Committed: Thu Oct 2 14:08:15 2014 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                       | 3 +++
 .../java/org/apache/hadoop/hdfs/server/namenode/NameNode.java     | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf025cc3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index d989ac4..c4ac392 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -536,6 +536,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7162. Wrong path when deleting through fuse-dfs a file which already
     exists in trash (Chenging Liu via cmccabe)
 
+    HDFS-7176. The namenode usage message doesn't include "-rollingupgrade
+    started" (cmccabe)
+
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
   
       HDFS-6387. HDFS CLI admin tool for creating & deleting an

http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf025cc3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index 523529d..ac86e6b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -217,7 +217,8 @@ public class NameNode implements NameNodeStatusMXBean {
       + StartupOption.ROLLBACK.getName() + "] | \n\t["
       + StartupOption.ROLLINGUPGRADE.getName() + " <"
       + 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.IMPORT.getName() + "] | \n\t["
       + StartupOption.INITIALIZESHAREDEDITS.getName() + "] | \n\t["


Mime
View raw message