update keep-alive config

JoeCqupt · Sep 14, 2024 · 658392c · 658392c
1 parent 783e01d
commit 658392c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/src/main/java/io/github/xinfra/lab/remoting/connection/DefaultConnectionFactory.java b/src/main/java/io/github/xinfra/lab/remoting/connection/DefaultConnectionFactory.java
@@ -69,7 +69,8 @@ public DefaultConnectionFactory(Protocol protocol, List<Supplier<ChannelHandler>
 		this.connectionConfig = connectionConfig;
 
 		bootstrap = new Bootstrap();
-		bootstrap.group(workerGroup).channel(channelClass).handler(new ChannelInitializer<SocketChannel>() {
+		bootstrap.option(ChannelOption.SO_KEEPALIVE, true)
+				.group(workerGroup).channel(channelClass).handler(new ChannelInitializer<SocketChannel>() {
 
 			@Override
 			protected void initChannel(SocketChannel ch) throws Exception {
@@ -94,6 +95,7 @@ protected void initChannel(SocketChannel ch) throws Exception {
 	public Connection create(SocketAddress socketAddress) throws RemotingException {
 		bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, connectionConfig.getConnectTimeout());
 		ChannelFuture future = bootstrap.connect(socketAddress);
+
 		future.awaitUninterruptibly();
 		if (!future.isDone()) {
 			String errMsg = "Create connection to " + socketAddress + " timeout!";

diff --git a/src/main/java/io/github/xinfra/lab/remoting/rpc/heartbeat/RpcHeartbeatTrigger.java b/src/main/java/io/github/xinfra/lab/remoting/rpc/heartbeat/RpcHeartbeatTrigger.java
@@ -33,7 +33,8 @@ public void triggerHeartBeat(ChannelHandlerContext ctx) {
 		int heartbeatFailCount = connection.getHeartbeatFailCnt();
 		if (heartbeatFailCount > maxFailCount) {
 			connection.close();
-			log.error("close connection after heartbeat fail {} times", heartbeatFailCount);
+			log.error("close connection after heartbeat fail {} times. remote address:{}",
+					heartbeatFailCount, connection.remoteAddress());
 			return;
 		}
 

diff --git a/src/main/java/io/github/xinfra/lab/remoting/server/BaseRemotingServer.java b/src/main/java/io/github/xinfra/lab/remoting/server/BaseRemotingServer.java
@@ -14,6 +14,7 @@
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.ServerChannel;
@@ -87,6 +88,7 @@ public void startup() {
 		this.serverBootstrap = new ServerBootstrap();
 		this.serverBootstrap.group(bossGroup, workerGroup)
 			.channel(serverChannelClass)
+				.childOption(ChannelOption.SO_KEEPALIVE, true)
 			.childHandler(new ChannelInitializer<SocketChannel>() {
 				@Override
 				protected void initChannel(SocketChannel channel) throws Exception {
@@ -97,7 +99,9 @@ protected void initChannel(SocketChannel channel) throws Exception {
 
 					if (config.isIdleSwitch()) {
 						pipeline.addLast("idleStateHandler",
-								new IdleStateHandler(60000, 60000, 0, TimeUnit.MILLISECONDS));
+								new IdleStateHandler(config.getIdleReaderTimeout(),
+										config.getIdleWriterTimeout(),
+										config.getIdleAllTimeout(), TimeUnit.MILLISECONDS));
 						pipeline.addLast("serverIdleHandler", serverIdleHandler);
 					}
 					pipeline.addLast("handler", handler);

diff --git a/src/main/java/io/github/xinfra/lab/remoting/server/RemotingServerConfig.java b/src/main/java/io/github/xinfra/lab/remoting/server/RemotingServerConfig.java
@@ -9,6 +9,12 @@ public class RemotingServerConfig {
 
 	private boolean manageConnection = false;
 
-	private boolean idleSwitch = false;
+	private boolean idleSwitch = true;
+
+	private long idleReaderTimeout = 0L;
+
+	private long idleWriterTimeout = 0L;
+
+	private long idleAllTimeout = 90000L;
 
 }