发布2.3.23

wangzihao · wangzihao · commit a4060c691491 · 2024-09-13T13:39:56.000+08:00
hotfix: bug# 解决客户端的tcp连接建立繁忙时，客户端会出现connection reset
diff --git a/README.md b/README.md
@@ -149,7 +149,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
 <dependency>
   <groupId>com.github.wangzihaogithub</groupId>
   <artifactId>spring-boot-protocol</artifactId>
-  <version>2.3.22</version>
+  <version>2.3.23</version>
 </dependency>
 ```
 
@@ -161,7 +161,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
 <dependency>
   <groupId>com.github.wangzihaogithub</groupId>
   <artifactId>netty-servlet</artifactId>
-  <version>2.3.22</version>
+  <version>2.3.23</version>
 </dependency>
 ```
 
@@ -317,7 +317,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
         <dependency>
           <groupId>com.github.wangzihaogithub</groupId>
           <artifactId>spring-boot-protocol</artifactId>
-          <version>2.3.22</version>
+          <version>2.3.23</version>
         </dependency>
 
         2.编写代码
@@ -397,7 +397,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
         <dependency>
           <groupId>com.github.wangzihaogithub</groupId>
           <artifactId>spring-boot-protocol</artifactId>
-          <version>2.3.22</version>
+          <version>2.3.23</version>
         </dependency>
 
         2.编写代码
@@ -486,7 +486,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
          <dependency>
               <groupId>com.github.wangzihaogithub</groupId>
               <artifactId>spring-boot-protocol</artifactId>
-              <version>2.3.22</version>
+              <version>2.3.23</version>
         </dependency>
         
         2.编写启动类
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.github.wangzihaogithub</groupId>
     <artifactId>spring-boot-protocol</artifactId>
-    <version>2.3.22</version>
+    <version>2.3.23</version>
     <packaging>jar</packaging>
 
     <name>Spring Boot Protocol</name>
@@ -49,7 +49,7 @@
         <connection>scm:git:https://github.com/wangzihaogithub/spring-boot-protocol.git</connection>
         <developerConnection>scm:git:git@github.com:wangzihaogithub/spring-boot-protocol.git</developerConnection>
         <url>git@github.com:wangzihaogithub/spring-boot-protocol.git</url>
-        <tag>v2.3.22</tag>
+        <tag>v2.3.23</tag>
     </scm>
 
     <!-- 开发者信息 -->
diff --git a/src/main/java/com/github/netty/protocol/DynamicProtocolChannelHandler.java b/src/main/java/com/github/netty/protocol/DynamicProtocolChannelHandler.java
@@ -48,7 +48,7 @@ public class DynamicProtocolChannelHandler extends AbstractChannelHandler<ByteBu
      * When there is a new link Access, if the packet is confiscated in time,
      * the server will turn off the link or perform timeout processing.
      */
-    private long firstClientPacketReadTimeoutMs = 1000;
+    private long firstClientPacketReadTimeoutMs = 800;
 
     public DynamicProtocolChannelHandler() {
         super(false);
@@ -63,11 +63,13 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
         TcpChannel tcpChannel = new TcpChannel(channel, this);
         addConnection(id, tcpChannel);
 
-        ctx.executor().schedule(() -> {
-            if (tcpChannel.getProtocol() == null && tcpChannel.isActive()) {
-                onProtocolBindTimeout(ctx, tcpChannel);
-            }
-        }, firstClientPacketReadTimeoutMs, TimeUnit.MILLISECONDS);
+        if (protocolHandlers.size() > 1 && firstClientPacketReadTimeoutMs >= 0) {
+            ctx.executor().schedule(() -> {
+                if (tcpChannel.getProtocol() == null && tcpChannel.isActive()) {
+                    onProtocolBindTimeout(ctx, tcpChannel);
+                }
+            }, firstClientPacketReadTimeoutMs, TimeUnit.MILLISECONDS);
+        }
 
         channel.pipeline().addLast(removeTcpChannelHandler);
         if (bytesMetricsChannelHandler != null) {
@@ -127,6 +129,9 @@ protected void addPipeline(ChannelHandlerContext ctx, ProtocolHandler protocolHa
     }
 
     public ProtocolHandler getProtocolHandler(ByteBuf clientFirstMsg) {
+        if (protocolHandlers.size() == 1) {
+            return protocolHandlers.iterator().next();
+        }
         for (ProtocolHandler protocolHandler : protocolHandlers) {
             if (protocolHandler.canSupport(clientFirstMsg)) {
                 return protocolHandler;
@@ -136,6 +141,9 @@ public ProtocolHandler getProtocolHandler(ByteBuf clientFirstMsg) {
     }
 
     public ProtocolHandler getProtocolHandler(Channel channel) {
+        if (protocolHandlers.size() == 1) {
+            return protocolHandlers.iterator().next();
+        }
         for (ProtocolHandler protocolHandler : protocolHandlers) {
             if (protocolHandler.canSupport(channel)) {
                 return protocolHandler;
@@ -184,7 +192,9 @@ protected void onProtocolBindTimeout(ChannelHandlerContext ctx, TcpChannel tcpCh
 
     protected void onNoSupportProtocol(ChannelHandlerContext ctx, ByteBuf clientFirstMsg) {
         if (clientFirstMsg != null) {
-            logger.warn("Received no support protocol. message=[{}]", clientFirstMsg.toString(Charset.forName("UTF-8")));
+            if (logger.isWarnEnabled()) {
+                logger.warn("Received no support protocol. message=[{}]", clientFirstMsg.toString(Charset.forName("UTF-8")));
+            }
             if (clientFirstMsg.refCnt() > 0) {
                 clientFirstMsg.release();
             }
@@ -214,7 +224,9 @@ public int getConnectionCount() {
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        logger.warn("Failed to initialize a channel. Closing: " + ctx.channel(), cause);
+        if (logger.isWarnEnabled()) {
+            logger.warn("Failed to initialize a channel. Closing: " + ctx.channel(), cause);
+        }
         ctx.close();
     }
 
@@ -248,8 +260,11 @@ public void enableTcpPackageLog(LogLevel logLevel) {
     public class RemoveTcpChannelHandler extends ChannelInboundHandlerAdapter {
         @Override
         public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-            super.channelInactive(ctx);
-            removeConnection(ctx.channel().id());
+            try {
+                super.channelInactive(ctx);
+            } finally {
+                removeConnection(ctx.channel().id());
+            }
         }
     }
 
diff --git a/src/main/java/com/github/netty/springboot/NettyProperties.java b/src/main/java/com/github/netty/springboot/NettyProperties.java
@@ -91,6 +91,26 @@ public class NettyProperties implements Serializable {
      * 是否禁用Nagle算法，true=禁用Nagle算法. 即数据包立即发送出去 (在TCP_NODELAY模式下，假设有3个小包要发送，第一个小包发出后，接下来的小包需要等待之前的小包被ack，在这期间小包会合并，直到接收到之前包的ack后才会发生)
      */
     private boolean tcpNodelay = false;
+
+    /**
+     * 用于设置写缓冲区的低水位线和高水位线。
+     * 如果写入缓冲区中排队的字节数超过高水位线,Channel#isWritable将开始返回false
+     * 如果写入缓冲区中排队的字节数超过高水位线然后下降到低水位线以下，Channel#isWritable将开始返回true
+     * 一般影响http2,请注意，消息需要由@link MessageSizeEstimator处理，以提供精确的背压。
+     */
+    private int lowWaterMark = 32 * 1024;
+
+    /**
+     * 用于设置写缓冲区的低水位线和高水位线。
+     * 如果写入缓冲区中排队的字节数超过高水位线,Channel#isWritable将开始返回false
+     * 如果写入缓冲区中排队的字节数超过高水位线然后下降到低水位线以下，Channel#isWritable将开始返回true
+     * 一般影响http2,请注意，消息需要由@link MessageSizeEstimator处理，以提供精确的背压。
+     */
+    private int highWaterMark = Integer.MAX_VALUE;
+    /**
+     * 如果true，则Netty会在Channel写入失败时会自动立即关闭。默认值为true
+     */
+    private boolean autoClose = true;
     /**
      * tcp 接收数据缓冲区大小字节 (默认-1 跟随内核设置)
      */
@@ -100,9 +120,15 @@ public class NettyProperties implements Serializable {
      */
     private int soSndbuf = -1;
     /**
-     * tcp 服务端接收新连接,等待被accept出的, 队列大小 (默认50)
+     * tcp 服务端接收新连接,等待被accept出的, 队列大小 (默认-1 跟随内核设置)
+     * 确定平台的默认somaxconn（服务器套接字积压）值。
+     * 已知默认值：-Windows NT服务器4.0+：200，Linux和MacOS:128
+     * 查看命令
+     * cat /proc/sys/net/core/somaxconn
+     * sysctl kern.ipc.somaxconn
+     * sysctl kern.ipc.soacceptqueue
      */
-    private int soBacklog = 50;
+    private int soBacklog = -1;
     /**
      * netty的内存泄漏检测级别(调试程序的时候用). 默认禁用, 不然极其耗费性能
      */
@@ -115,6 +141,22 @@ public class NettyProperties implements Serializable {
     public NettyProperties() {
     }
 
+    public int getLowWaterMark() {
+        return lowWaterMark;
+    }
+
+    public void setLowWaterMark(int lowWaterMark) {
+        this.lowWaterMark = lowWaterMark;
+    }
+
+    public int getHighWaterMark() {
+        return highWaterMark;
+    }
+
+    public void setHighWaterMark(int highWaterMark) {
+        this.highWaterMark = highWaterMark;
+    }
+
     public ApplicationX getApplication() {
         return application;
     }
@@ -127,6 +169,14 @@ public void setSoBacklog(int soBacklog) {
         this.soBacklog = soBacklog;
     }
 
+    public boolean isAutoClose() {
+        return autoClose;
+    }
+
+    public void setAutoClose(boolean autoClose) {
+        this.autoClose = autoClose;
+    }
+
     public int getSoRcvbuf() {
         return soRcvbuf;
     }
diff --git a/src/main/java/com/github/netty/springboot/server/NettyTcpServer.java b/src/main/java/com/github/netty/springboot/server/NettyTcpServer.java
@@ -120,8 +120,8 @@ protected void config(ServerBootstrap bootstrap) throws Exception {
             System.setProperty("io.netty.maxDirectMemory", String.valueOf(maxDirectMemory));
         }
 //        bootstrap.childOption(ChannelOption.WRITE_SPIN_COUNT,Integer.MAX_VALUE);
-        bootstrap.childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(32 * 1024, Integer.MAX_VALUE));
-        bootstrap.childOption(ChannelOption.AUTO_CLOSE, true);
+        bootstrap.childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(properties.getLowWaterMark(), properties.getHighWaterMark()));
+        bootstrap.childOption(ChannelOption.AUTO_CLOSE, properties.isAutoClose());
         if (properties.getSoRcvbuf() > 0) {
             bootstrap.childOption(ChannelOption.SO_RCVBUF, properties.getSoRcvbuf());
         }
diff --git a/src/main/resources/server.properties b/src/main/resources/server.properties
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-server.info=Github Spring-boot-protocol/2.3.22
-server.number=2.3.22
-server.built=Aug 6 2024 19:09:02 UTC+8
+server.info=Github Spring-boot-protocol/2.3.23
+server.number=2.3.23
+server.built=Sep 13 2024 13:23:31 UTC+8

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ protected void config(ServerBootstrap bootstrap) throws Exception {`
`120`	`120`	`System.setProperty("io.netty.maxDirectMemory", String.valueOf(maxDirectMemory));`
`121`	`121`	`}`
`122`	`122`	`// bootstrap.childOption(ChannelOption.WRITE_SPIN_COUNT,Integer.MAX_VALUE);`
`123`		`- bootstrap.childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(32 * 1024, Integer.MAX_VALUE));`
`124`		`- bootstrap.childOption(ChannelOption.AUTO_CLOSE, true);`
	`123`	`+ bootstrap.childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(properties.getLowWaterMark(), properties.getHighWaterMark()));`
	`124`	`+ bootstrap.childOption(ChannelOption.AUTO_CLOSE, properties.isAutoClose());`
`125`	`125`	`if (properties.getSoRcvbuf() > 0) {`
`126`	`126`	`bootstrap.childOption(ChannelOption.SO_RCVBUF, properties.getSoRcvbuf());`
`127`	`127`	`}`