big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-19218 Avoid DNS lookup while creating IPC Connection object (#6916). Contributed by Viraj Jasani.

Browse Source 
Signed-off-by: Rushabh Shah <shahrs87@apache.org>
Signed-off-by: He Xiaoqiao <hexiaoqiao@apache.org>
This commit is contained in:
Viraj Jasani 2024-07-16 05:08:41 -08:00 committed by GitHub
parent 5730656660
commit 1360c7574a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
View File

@ -2034,11 +2034,7 @@ public class Connection {
* Address to which the socket is connected to.
*/
private final InetAddress addr;
/**
* Client Host address from where the socket connection is being established to the Server.
*/
private final String hostName;
IpcConnectionContextProto connectionContext;
String protocolName;
SaslServer saslServer;
@ -2081,12 +2077,9 @@ public Connection(SocketChannel channel, long lastContact,
this.isOnAuxiliaryPort = isOnAuxiliaryPort;
if (addr == null) {
this.hostAddress = "*Unknown*";
this.hostName = this.hostAddress;
} else {
// host IP address
this.hostAddress = addr.getHostAddress();
// host name for the IP address
this.hostName = addr.getHostName();
}
this.remotePort = socket.getPort();
this.responseQueue = new LinkedList<RpcCall>();
@ -2102,7 +2095,7 @@ public Connection(SocketChannel channel, long lastContact,
@Override
public String toString() {
return hostName + ":" + remotePort + " / " + hostAddress + ":" + remotePort;
return hostAddress + ":" + remotePort;
}
boolean setShouldClose() {
@ -2516,6 +2509,7 @@ public int readAndProcess() throws IOException, InterruptedException {
}
if (!RpcConstants.HEADER.equals(dataLengthBuffer)) {
final String hostName = addr == null ? this.hostAddress : addr.getHostName();
LOG.warn("Incorrect RPC Header length from {}:{} / {}:{}. Expected: {}. Actual: {}",
hostName, remotePort, hostAddress, remotePort, RpcConstants.HEADER,
dataLengthBuffer);
@ -2523,6 +2517,7 @@ public int readAndProcess() throws IOException, InterruptedException {
return -1;
}
if (version != CURRENT_VERSION) {
final String hostName = addr == null ? this.hostAddress : addr.getHostName();
//Warning is ok since this is not supposed to happen.
LOG.warn("Version mismatch from {}:{} / {}:{}. "
+ "Expected version: {}. Actual version: {} ", hostName,

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
View File

@ -1177,7 +1177,7 @@ private static void callAndVerify(Server server, InetSocketAddress addr,
Connection connection = server.getConnections()[0];
LOG.info("Connection is from: {}", connection);
assertEquals(
"Connection string representation should include both IP address and Host name", 2,
"Connection string representation should include only IP address for healthy connection", 1,
connection.toString().split(" / ").length);
int serviceClass2 = connection.getServiceClass();
assertFalse(noChanged ^ serviceClass == serviceClass2);

4
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
View File

@ -1941,8 +1941,8 @@ public RpcStatusProto getRpcStatusProto() {
String connectionInfo = conns[0].toString();
LOG.info("Connection is from: {}", connectionInfo);
assertEquals(
"Connection string representation should include both IP address and Host name", 2,
connectionInfo.split(" / ").length);
"Connection string representation should include only IP address for healthy "
+ "connection", 1, connectionInfo.split(" / ").length);
// verify whether the connection should have been reused.
if (isDisconnected) {
assertNotSame(reqName, lastConn, conns[0]);