Browse Source

Revert HADOOP-4482 while it is being fixed.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@708978 13f79535-47bb-0310-9956-ffa450edef68
Owen O'Malley 17 năm trước cách đây
mục cha
commit
6ec8a13a29

+ 0 - 3
CHANGES.txt

@@ -77,9 +77,6 @@ Trunk (unreleased changes)
     HADOOP-4440.  TestJobInProgressListener tests for jobs killed in queued 
     HADOOP-4440.  TestJobInProgressListener tests for jobs killed in queued 
     state (Amar Kamat via ddas)
     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
     HADOOP-4346. Implement blocking connect so that Hadoop is not affected
     by selector problem with JDK default implementation. (Raghu Angadi)
     by selector problem with JDK default implementation. (Raghu Angadi)
 
 

+ 1 - 1
src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java

@@ -365,7 +365,7 @@ public class DataNode extends Configured
     this.infoServer.start();
     this.infoServer.start();
     // adjust info port
     // adjust info port
     this.dnRegistration.setInfoPort(this.infoServer.getPort());
     this.dnRegistration.setInfoPort(this.infoServer.getPort());
-    myMetrics = new DataNodeMetrics(conf, dnRegistration.getName());
+    myMetrics = new DataNodeMetrics(conf, dnRegistration.getStorageID());
     
     
     //init ipc server
     //init ipc server
     InetSocketAddress ipcAddr = NetUtils.createSocketAddr(
     InetSocketAddress ipcAddr = NetUtils.createSocketAddr(