You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by cn...@apache.org on 2013/10/17 20:10:09 UTC
svn commit: r1533184 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Author: cnauroth
Date: Thu Oct 17 18:10:09 2013
New Revision: 1533184
URL: http://svn.apache.org/r1533184
Log:
HDFS-5336. Merging change r1533183 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1533184&r1=1533183&r2=1533184&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Oct 17 18:10:09 2013
@@ -117,6 +117,9 @@ Release 2.3.0 - UNRELEASED
HDFS-5375. hdfs.cmd does not expose several snapshot commands. (cnauroth)
+ HDFS-5336. DataNode should not output 'StartupProgress' metrics.
+ (Akira Ajisaka via cnauroth)
+
Release 2.2.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1533184&r1=1533183&r2=1533184&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java Thu Oct 17 18:10:09 2013
@@ -272,10 +272,6 @@ public class NameNode implements NameNod
static NameNodeMetrics metrics;
private static final StartupProgress startupProgress = new StartupProgress();
- static {
- StartupProgressMetrics.register(startupProgress);
- }
-
/** Return the {@link FSNamesystem} object.
* @return {@link FSNamesystem} object.
*/
@@ -487,6 +483,7 @@ public class NameNode implements NameNod
loginAsNameNodeUser(conf);
NameNode.initMetrics(conf, this.getRole());
+ StartupProgressMetrics.register(startupProgress);
if (NamenodeRole.NAMENODE == role) {
startHttpServer(conf);