Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-6031: allow OS level socket keep alive checking 

This closes #3307.

Signed-off-by: Bryan Bende <bbende@apache.org>
This commit is contained in:
Endre Zoltan Kovacs 2019-02-14 17:48:49 +01:00 committed by Bryan Bende
parent 8a197e5a96
commit ae8a794ff0
No known key found for this signature in database
GPG Key ID: A0DDA9ED50711C39
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/SocketChannelDispatcher.java
View File

@ -146,6 +146,7 @@ public class SocketChannelDispatcher<E extends Event<SocketChannel>> implements
// Handle new connections coming in // Handle new connections coming in
final ServerSocketChannel channel = (ServerSocketChannel) key.channel(); final ServerSocketChannel channel = (ServerSocketChannel) key.channel();
final SocketChannel socketChannel = channel.accept(); final SocketChannel socketChannel = channel.accept();
socketChannel.setOption(StandardSocketOptions.SO_KEEPALIVE, true);
// Check for available connections // Check for available connections
if (currentConnections.incrementAndGet() > maxConnections){ if (currentConnections.incrementAndGet() > maxConnections){
currentConnections.decrementAndGet(); currentConnections.decrementAndGet();

2
nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/record/listen/SocketChannelRecordReaderDispatcher.java
View File

@ -25,6 +25,7 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngine;
import java.io.Closeable; import java.io.Closeable;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.net.StandardSocketOptions;
import java.nio.channels.ServerSocketChannel; import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
@ -79,6 +80,7 @@ public class SocketChannelRecordReaderDispatcher implements Runnable, Closeable
continue; continue;
} }
socketChannel.setOption(StandardSocketOptions.SO_KEEPALIVE, true);
final SocketAddress remoteSocketAddress = socketChannel.getRemoteAddress(); final SocketAddress remoteSocketAddress = socketChannel.getRemoteAddress();
socketChannel.socket().setSoTimeout(socketReadTimeout); socketChannel.socket().setSoTimeout(socketReadTimeout);
socketChannel.socket().setReceiveBufferSize(receiveBufferSize); socketChannel.socket().setReceiveBufferSize(receiveBufferSize);