You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2008/10/29 19:40:15 UTC

svn commit: r708978 - in /hadoop/core/trunk: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java

Author: omalley
Date: Wed Oct 29 11:40:14 2008
New Revision: 708978

URL: http://svn.apache.org/viewvc?rev=708978&view=rev
Log:
Revert HADOOP-4482 while it is being fixed.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=708978&r1=708977&r2=708978&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Oct 29 11:40:14 2008
@@ -77,9 +77,6 @@
     HADOOP-4440.  TestJobInProgressListener tests for jobs killed in queued 
     state (Amar Kamat via ddas)
 
-    HADOOP-4482. Make the JMX monitoring use predictable names for the 
-    datanodes to enable Nagios monitoring. (Brian Bockelman via omalley)
-
     HADOOP-4346. Implement blocking connect so that Hadoop is not affected
     by selector problem with JDK default implementation. (Raghu Angadi)
 

Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=708978&r1=708977&r2=708978&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java Wed Oct 29 11:40:14 2008
@@ -365,7 +365,7 @@
     this.infoServer.start();
     // adjust info port
     this.dnRegistration.setInfoPort(this.infoServer.getPort());
-    myMetrics = new DataNodeMetrics(conf, dnRegistration.getName());
+    myMetrics = new DataNodeMetrics(conf, dnRegistration.getStorageID());
     
     //init ipc server
     InetSocketAddress ipcAddr = NetUtils.createSocketAddr(