Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-03-06 09:29:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-7758: Avoid calling InetAddress.getHostName() because doing so results in a reverse DNS Lookup, which can be expensive

Browse Source 
Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #4487.
This commit is contained in:
Mark Payne 2020-08-24 09:11:00 -04:00 committed by Pierre Villard
parent 8baa5c9940
commit 11a4127a9f
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannel.java
View File

@ -51,7 +51,7 @@ public class SSLSocketChannel implements Closeable {
private static final Logger logger = LoggerFactory.getLogger(SSLSocketChannel.class);
private static final long BUFFER_FULL_EMPTY_WAIT_NANOS = TimeUnit.NANOSECONDS.convert(1, TimeUnit.MILLISECONDS);
private final String hostname;
private final String remoteAddress;
private final int port;
private final SSLEngine engine;
private final SocketAddress socketAddress;
@ -77,7 +77,7 @@ public class SSLSocketChannel implements Closeable {
final SocketAddress localSocketAddress = new InetSocketAddress(localAddress, 0);
this.channel.bind(localSocketAddress);
}
this.hostname = hostname;
this.remoteAddress = hostname;
this.port = port;
this.engine = sslContext.createSSLEngine();
this.engine.setUseClientMode(client);
@ -97,7 +97,7 @@ public class SSLSocketChannel implements Closeable {
this.socketAddress = socketChannel.getRemoteAddress();
final Socket socket = socketChannel.socket();
this.hostname = socket.getInetAddress().getHostName();
this.remoteAddress = socket.getInetAddress().toString();
this.port = socket.getPort();
this.engine = sslContext.createSSLEngine();
@ -118,7 +118,7 @@ public class SSLSocketChannel implements Closeable {
this.socketAddress = socketChannel.getRemoteAddress();
final Socket socket = socketChannel.socket();
this.hostname = socket.getInetAddress().getHostName();
this.remoteAddress = socket.getInetAddress().toString();
this.port = socket.getPort();
// don't set useClientMode or needClientAuth, use the engine as is and let the caller configure it
@ -149,7 +149,7 @@ public class SSLSocketChannel implements Closeable {
throw new TransmissionDisabledException();
}
if (System.currentTimeMillis() > startTime + timeoutMillis) {
throw new SocketTimeoutException("Timed out connecting to " + hostname + ":" + port);
throw new SocketTimeoutException("Timed out connecting to " + remoteAddress + ":" + port);
}
try {
@ -311,7 +311,7 @@ public class SSLSocketChannel implements Closeable {
long sleepNanos = 1L;
if (readCount == 0) {
if (System.currentTimeMillis() > startTime + timeoutMillis) {
throw new SocketTimeoutException("Timed out reading from socket connected to " + hostname + ":" + port);
throw new SocketTimeoutException("Timed out reading from socket connected to " + remoteAddress + ":" + port);
}
try {
TimeUnit.NANOSECONDS.sleep(sleepNanos);
@ -370,7 +370,7 @@ public class SSLSocketChannel implements Closeable {
lastByteWrittenTime = now;
} else {
if (now > lastByteWrittenTime + timeoutMillis) {
throw new SocketTimeoutException("Timed out writing to socket connected to " + hostname + ":" + port);
throw new SocketTimeoutException("Timed out writing to socket connected to " + remoteAddress + ":" + port);
}
try {
TimeUnit.NANOSECONDS.sleep(sleepNanos);