Author: daryn
Date: Fri Nov 9 00:56:50 2012
New Revision: 1407334
URL: http://svn.apache.org/viewvc?rev=1407334&view=rev
Log:
svn merge -c 1407333 FIXES: HDFS-3990. NN's health report has severe
performance problems (daryn)
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/protocol/DatanodeID.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.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=1407334&r1=1407333&r2=1407334&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
Fri Nov 9 00:56:50 2012
@@ -1677,6 +1677,8 @@ Release 0.23.5 - UNRELEASED
HDFS-4075. Reduce recommissioning overhead (Kihwal Lee via daryn)
+ HDFS-3990. NN's health report has severe performance problems (daryn)
+
BUG FIXES
HDFS-3829. TestHftpURLTimeouts fails intermittently with JDK7 (Trevor
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java?rev=1407334&r1=1407333&r2=1407334&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
Fri Nov 9 00:56:50 2012
@@ -38,7 +38,8 @@ public class DatanodeID implements Compa
public static final DatanodeID[] EMPTY_ARRAY = {};
private String ipAddr; // IP address
- private String hostName; // hostname
+ private String hostName; // hostname claimed by datanode
+ private String peerHostName; // hostname from the actual connection
private String storageID; // unique per cluster storageID
private int xferPort; // data streaming port
private int infoPort; // info server port
@@ -51,6 +52,7 @@ public class DatanodeID implements Compa
from.getXferPort(),
from.getInfoPort(),
from.getIpcPort());
+ this.peerHostName = from.getPeerHostName();
}
/**
@@ -76,6 +78,10 @@ public class DatanodeID implements Compa
this.ipAddr = ipAddr;
}
+ public void setPeerHostName(String peerHostName) {
+ this.peerHostName = peerHostName;
+ }
+
public void setStorageID(String storageID) {
this.storageID = storageID;
}
@@ -95,6 +101,13 @@ public class DatanodeID implements Compa
}
/**
+ * @return hostname from the actual connection
+ */
+ public String getPeerHostName() {
+ return peerHostName;
+ }
+
+ /**
* @return IP:xferPort string
*/
public String getXferAddr() {
@@ -202,6 +215,7 @@ public class DatanodeID implements Compa
public void updateRegInfo(DatanodeID nodeReg) {
ipAddr = nodeReg.getIpAddr();
hostName = nodeReg.getHostName();
+ peerHostName = nodeReg.getPeerHostName();
xferPort = nodeReg.getXferPort();
infoPort = nodeReg.getInfoPort();
ipcPort = nodeReg.getIpcPort();
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.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/blockmanagement/DatanodeManager.java?rev=1407334&r1=1407333&r2=1407334&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
Fri Nov 9 00:56:50 2012
@@ -523,28 +523,16 @@ public class DatanodeManager {
private static boolean checkInList(final DatanodeID node,
final Set<String> hostsList,
final boolean isExcludeList) {
- final InetAddress iaddr;
-
- try {
- iaddr = InetAddress.getByName(node.getIpAddr());
- } catch (UnknownHostException e) {
- LOG.warn("Unknown IP: " + node.getIpAddr(), e);
- return isExcludeList;
- }
-
// if include list is empty, host is in include list
if ( (!isExcludeList) && (hostsList.isEmpty()) ){
return true;
}
- return // compare ipaddress(:port)
- (hostsList.contains(iaddr.getHostAddress().toString()))
- || (hostsList.contains(iaddr.getHostAddress().toString() + ":"
- + node.getXferPort()))
- // compare hostname(:port)
- || (hostsList.contains(iaddr.getHostName()))
- || (hostsList.contains(iaddr.getHostName() + ":" + node.getXferPort()))
- || ((node instanceof DatanodeInfo) && hostsList
- .contains(((DatanodeInfo) node).getHostName()));
+ for (String name : getNodeNamesForHostFiltering(node)) {
+ if (hostsList.contains(name)) {
+ return true;
+ }
+ }
+ return false;
}
/**
@@ -627,16 +615,20 @@ public class DatanodeManager {
*/
public void registerDatanode(DatanodeRegistration nodeReg)
throws DisallowedDatanodeException {
- String dnAddress = Server.getRemoteAddress();
- if (dnAddress == null) {
- // Mostly called inside an RPC.
- // But if not, use address passed by the data-node.
- dnAddress = nodeReg.getIpAddr();
+ InetAddress dnAddress = Server.getRemoteIp();
+ if (dnAddress != null) {
+ // Mostly called inside an RPC, update ip and peer hostname
+ String hostname = dnAddress.getHostName();
+ String ip = dnAddress.getHostAddress();
+ if (hostname.equals(ip)) {
+ LOG.warn("Unresolved datanode registration from " + ip);
+ throw new DisallowedDatanodeException(nodeReg);
+ }
+ // update node registration with the ip and hostname from rpc request
+ nodeReg.setIpAddr(ip);
+ nodeReg.setPeerHostName(hostname);
}
- // Update the IP to the address of the RPC request that is
- // registering this datanode.
- nodeReg.setIpAddr(dnAddress);
nodeReg.setExportedKeys(blockManager.getBlockKeys());
// Checks if the node is not on the hosts list. If it is not, then
@@ -1016,19 +1008,8 @@ public class DatanodeManager {
if ( (isDead && listDeadNodes) || (!isDead && listLiveNodes) ) {
nodes.add(dn);
}
- // Remove any nodes we know about from the map
- try {
- InetAddress inet = InetAddress.getByName(dn.getIpAddr());
- // compare hostname(:port)
- mustList.remove(inet.getHostName());
- mustList.remove(inet.getHostName()+":"+dn.getXferPort());
- // compare ipaddress(:port)
- mustList.remove(inet.getHostAddress().toString());
- mustList.remove(inet.getHostAddress().toString()+ ":"
+dn.getXferPort());
- } catch (UnknownHostException e) {
- mustList.remove(dn.getName());
- mustList.remove(dn.getIpAddr());
- LOG.warn(e);
+ for (String name : getNodeNamesForHostFiltering(dn)) {
+ mustList.remove(name);
}
}
}
@@ -1049,6 +1030,25 @@ public class DatanodeManager {
return nodes;
}
+ private static List<String> getNodeNamesForHostFiltering(DatanodeID node) {
+ String ip = node.getIpAddr();
+ String regHostName = node.getHostName();
+ int xferPort = node.getXferPort();
+
+ List<String> names = new ArrayList<String>();
+ names.add(ip);
+ names.add(ip + ":" + xferPort);
+ names.add(regHostName);
+ names.add(regHostName + ":" + xferPort);
+
+ String peerHostName = node.getPeerHostName();
+ if (peerHostName != null) {
+ names.add(peerHostName);
+ names.add(peerHostName + ":" + xferPort);
+ }
+ return names;
+ }
+
private void setDatanodeDead(DatanodeDescriptor node) {
node.setLastUpdate(0);
}
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java?rev=1407334&r1=1407333&r2=1407334&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java
Fri Nov 9 00:56:50 2012
@@ -17,12 +17,12 @@
*/
package org.apache.hadoop.hdfs;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import java.net.InetSocketAddress;
+import java.security.Permission;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,6 +31,7 @@ import org.apache.hadoop.hdfs.protocol.D
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.hdfs.protocol.HdfsConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeManager;
import org.apache.hadoop.hdfs.server.common.IncorrectVersionException;
import org.apache.hadoop.hdfs.server.common.StorageInfo;
import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
@@ -47,6 +48,64 @@ public class TestDatanodeRegistration {
public static final Log LOG =
LogFactory.getLog(TestDatanodeRegistration.class);
+ private static class MonitorDNS extends SecurityManager {
+ int lookups = 0;
+ @Override
+ public void checkPermission(Permission perm) {}
+ @Override
+ public void checkConnect(String host, int port) {
+ if (port == -1) {
+ lookups++;
+ }
+ }
+ }
+
+ /**
+ * Ensure the datanode manager does not do host lookup after registration,
+ * especially for node reports.
+ * @throws Exception
+ */
+ @Test
+ public void testDNSLookups() throws Exception {
+ MonitorDNS sm = new MonitorDNS();
+ System.setSecurityManager(sm);
+
+ MiniDFSCluster cluster = null;
+ try {
+ HdfsConfiguration conf = new HdfsConfiguration();
+ cluster = new MiniDFSCluster.Builder(conf).numDataNodes(8).build();
+ cluster.waitActive();
+
+ int initialLookups = sm.lookups;
+ assertTrue("dns security manager is active", initialLookups != 0);
+
+ DatanodeManager dm =
+ cluster.getNamesystem().getBlockManager().getDatanodeManager();
+
+ // make sure no lookups occur
+ dm.refreshNodes(conf);
+ assertEquals(initialLookups, sm.lookups);
+
+ dm.refreshNodes(conf);
+ assertEquals(initialLookups, sm.lookups);
+
+ // ensure none of the reports trigger lookups
+ dm.getDatanodeListForReport(DatanodeReportType.ALL);
+ assertEquals(initialLookups, sm.lookups);
+
+ dm.getDatanodeListForReport(DatanodeReportType.LIVE);
+ assertEquals(initialLookups, sm.lookups);
+
+ dm.getDatanodeListForReport(DatanodeReportType.DEAD);
+ assertEquals(initialLookups, sm.lookups);
+ } finally {
+ if (cluster != null) {
+ cluster.shutdown();
+ }
+ System.setSecurityManager(null);
+ }
+ }
+
/**
* Regression test for HDFS-894 ensures that, when datanodes
* are restarted, the new IPC port is registered with the
