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

HDFS-3328. svn merge -c 1336480 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336481 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-05-10 04:54:50 +00:00
parent d0f920fba8
commit 037c8e99c1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -512,6 +512,8 @@ Release 2.0.0 - UNRELEASED
HDFS-3157. Error in deleting block is keep on coming from DN even after HDFS-3157. Error in deleting block is keep on coming from DN even after
the block report and directory scanning has happened. (Ashish Singhi via umamahesh) the block report and directory scanning has happened. (Ashish Singhi via umamahesh)
HDFS-3328. NPE in DataNode.getIpcPort. (eli)
BREAKDOWN OF HDFS-1623 SUBTASKS BREAKDOWN OF HDFS-1623 SUBTASKS
HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd) HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd)

3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
View File

@ -864,7 +864,7 @@ public class DataNode extends Configured
*/ */
public String getDisplayName() { public String getDisplayName() {
// NB: our DatanodeID may not be set yet // NB: our DatanodeID may not be set yet
return hostName + ":" + getIpcPort(); return hostName + ":" + getXferPort();
} }
/** /**
@ -881,7 +881,6 @@ public class DataNode extends Configured
/** /**
* @return the datanode's IPC port * @return the datanode's IPC port
*/ */
@VisibleForTesting
public int getIpcPort() { public int getIpcPort() {
return ipcServer.getListenerAddress().getPort(); return ipcServer.getListenerAddress().getPort();
} }