fix

Change-Id: I84ea8161077bc3b1ea54524640697ef793e7d093

Author: qianye1001

common/src/main/java/org/apache/rocketmq/common/thread/ThreadPoolMonitor.java

@@ -105,9 +105,10 @@ public static void logThreadPoolStatus() {
             List<ThreadPoolStatusMonitor> monitors = threadPoolWrapper.getStatusPrinters();
             for (ThreadPoolStatusMonitor monitor : monitors) {
                 double value = monitor.value(threadPoolWrapper.getThreadPoolExecutor());
-                String nameFormatted = String.format("%-40s", threadPoolWrapper.getName());
-                String descFormatted = String.format("%-12s", monitor.describe());
-                waterMarkLogger.info("{}{}{}", nameFormatted, descFormatted, value);
+                waterMarkLogger.info("\t{}\t{}\t{}", threadPoolWrapper.getName(),
+                    monitor.describe(),
+                    value);
+
                 if (enablePrintJstack) {
                     if (monitor.needPrintJstack(threadPoolWrapper.getThreadPoolExecutor(), value) &&
                         System.currentTimeMillis() - jstackTime > jstackPeriodTime) {

proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java

@@ -94,6 +94,17 @@ public class ProxyConfig implements ConfigFile {
     private boolean enableGrpcEpoll = false;
     private int grpcThreadPoolNums = 16 + PROCESSOR_NUMBER * 2;
     private int grpcThreadPoolQueueCapacity = 100000;
+
+    /**
+     * Maximum number of concurrent gRPC calls allowed per client connection.
+     * <p>
+     * A single client issuing excessively high concurrent requests may skew the validation load balancing
+     * and overload a single proxy instance (hotspot), potentially bringing it down. Limiting
+     * {@code grpcMaxConcurrentCallsPerConnection} helps mitigate this per-connection hotspot risk.
+     * <p>
+     * Note: Setting this limit too low may cause send/consume failures (e.g., backpressure or rejected calls).
+     */
+    private int grpcMaxConcurrentCallsPerConnection = Integer.MAX_VALUE;
     private String brokerConfigPath = ConfigurationManager.getProxyHome() + "/conf/broker.conf";
     /**
      * gRPC max message size
@@ -1572,4 +1583,12 @@ public int getReturnHandleGroupThreadPoolNums() {
     public void setReturnHandleGroupThreadPoolNums(int returnHandleGroupThreadPoolNums) {
         this.returnHandleGroupThreadPoolNums = returnHandleGroupThreadPoolNums;
     }
+
+    public int getGrpcMaxConcurrentCallsPerConnection() {
+        return grpcMaxConcurrentCallsPerConnection;
+    }
+
+    public void setGrpcMaxConcurrentCallsPerConnection(int grpcMaxConcurrentCallsPerConnection) {
+        this.grpcMaxConcurrentCallsPerConnection = grpcMaxConcurrentCallsPerConnection;
+    }
 }

proxy/src/main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java

@@ -24,16 +24,16 @@
 import io.grpc.netty.shaded.io.netty.channel.epoll.EpollServerSocketChannel;
 import io.grpc.netty.shaded.io.netty.channel.nio.NioEventLoopGroup;
 import io.grpc.netty.shaded.io.netty.channel.socket.nio.NioServerSocketChannel;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import org.apache.rocketmq.common.constant.LoggerName;
 import org.apache.rocketmq.logging.org.slf4j.Logger;
 import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
 import org.apache.rocketmq.proxy.config.ConfigurationManager;
+import org.apache.rocketmq.proxy.config.ProxyConfig;
 import org.apache.rocketmq.proxy.grpc.interceptor.ContextInterceptor;
 import org.apache.rocketmq.proxy.grpc.interceptor.GlobalExceptionInterceptor;
 import org.apache.rocketmq.proxy.grpc.interceptor.HeaderInterceptor;
-
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import org.apache.rocketmq.proxy.service.cert.TlsCertificateManager;
 
 public class GrpcServerBuilder {
@@ -52,18 +52,20 @@ public static GrpcServerBuilder newBuilder(ThreadPoolExecutor executor, int port
     }
 
     protected GrpcServerBuilder(ThreadPoolExecutor executor, int port, TlsCertificateManager tlsCertificateManager) {
+        ProxyConfig config = ConfigurationManager.getProxyConfig();
         this.tlsCertificateManager = tlsCertificateManager;
-        serverBuilder = NettyServerBuilder.forPort(port);
+        serverBuilder = NettyServerBuilder.forPort(port)
+            .maxConcurrentCallsPerConnection(config.getGrpcMaxConcurrentCallsPerConnection());
 
         serverBuilder.protocolNegotiator(new ProxyAndTlsProtocolNegotiator());
 
         // build server
-        int bossLoopNum = ConfigurationManager.getProxyConfig().getGrpcBossLoopNum();
-        int workerLoopNum = ConfigurationManager.getProxyConfig().getGrpcWorkerLoopNum();
-        int maxInboundMessageSize = ConfigurationManager.getProxyConfig().getGrpcMaxInboundMessageSize();
-        long idleTimeMills = ConfigurationManager.getProxyConfig().getGrpcClientIdleTimeMills();
+        int bossLoopNum = config.getGrpcBossLoopNum();
+        int workerLoopNum = config.getGrpcWorkerLoopNum();
+        int maxInboundMessageSize = config.getGrpcMaxInboundMessageSize();
+        long idleTimeMills = config.getGrpcClientIdleTimeMills();
 
-        if (ConfigurationManager.getProxyConfig().isEnableGrpcEpoll()) {
+        if (config.isEnableGrpcEpoll()) {
             serverBuilder.bossEventLoopGroup(new EpollEventLoopGroup(bossLoopNum))
                 .workerEventLoopGroup(new EpollEventLoopGroup(workerLoopNum))
                 .channelType(EpollServerSocketChannel.class)

proxy/src/main/resources/rmq.proxy.logback.xml

@@ -52,7 +52,7 @@
             <maxFileSize>128MB</maxFileSize>
         </triggeringPolicy>
         <encoder>
-            <pattern>%d{yyy-MM-dd HH:mm:ss,GMT+8} %m%n</pattern>
+            <pattern>%d{yyy-MM-dd HH:mm:ss,GMT+8}%m%n</pattern>
             <charset class="java.nio.charset.Charset">UTF-8</charset>
         </encoder>
     </appender>