From 20e9bdd3e4abdc69a8cdef85596da520aa1e435c Mon Sep 17 00:00:00 2001
From: "kaiyi.lk" <kaiyi.lk@alibaba-inc.com>
Date: Tue, 17 May 2022 21:06:00 +0800
Subject: [PATCH] [ISSUE #3949] v2 support

---
 .../rocketmq/proxy/grpc/v2/GrpcMessagingApplication.java  | 8 ++++----
 .../proxy/grpc/v2/consumer/ReceiveMessageActivity.java    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessagingApplication.java b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessagingApplication.java
index 85c0059c13..52cea43719 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessagingApplication.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessagingApplication.java
@@ -83,7 +83,7 @@ public class GrpcMessagingApplication extends MessagingServiceGrpc.MessagingServ
             config.getGrpcProducerThreadPoolNums(),
             1,
             TimeUnit.MINUTES,
-            "GrpcRouteThreadPool",
+            "GrpcProducerThreadPool",
             config.getGrpcProducerThreadQueueCapacity()
         );
         this.consumerThreadPoolExecutor = ThreadPoolMonitor.createAndMonitor(
@@ -91,7 +91,7 @@ public class GrpcMessagingApplication extends MessagingServiceGrpc.MessagingServ
             config.getGrpcConsumerThreadPoolNums(),
             1,
             TimeUnit.MINUTES,
-            "GrpcRouteThreadPool",
+            "GrpcConsumerThreadPool",
             config.getGrpcConsumerThreadQueueCapacity()
         );
         this.clientManagerThreadPoolExecutor = ThreadPoolMonitor.createAndMonitor(
@@ -99,7 +99,7 @@ public class GrpcMessagingApplication extends MessagingServiceGrpc.MessagingServ
             config.getGrpcClientManagerThreadPoolNums(),
             1,
             TimeUnit.MINUTES,
-            "GrpcRouteThreadPool",
+            "GrpcClientManagerThreadPool",
             config.getGrpcClientManagerThreadQueueCapacity()
         );
         this.transactionThreadPoolExecutor = ThreadPoolMonitor.createAndMonitor(
@@ -107,7 +107,7 @@ public class GrpcMessagingApplication extends MessagingServiceGrpc.MessagingServ
             config.getGrpcTransactionThreadPoolNums(),
             1,
             TimeUnit.MINUTES,
-            "GrpcRouteThreadPool",
+            "GrpcTransactionThreadPool",
             config.getGrpcTransactionThreadQueueCapacity()
         );
 
diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivity.java b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivity.java
index 27dc411ba9..673abca54d 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivity.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivity.java
@@ -63,7 +63,7 @@ public class ReceiveMessageActivity extends AbstractMessingActivity {
             pollTime = timeRemaining;
         }
         if (pollTime <= 0) {
-            writer.write(proxyContext, Code.MESSAGE_NOT_FOUND, "no new message");
+            writer.write(proxyContext, Code.MESSAGE_NOT_FOUND, "time remaining is too small");
             return;
         }