[rocketmq] branch develop updated: [ISSUR #5941] Fix the problem that acl is not loaded when the proxy starts

[zhouxzhan]

This is an automated email from the ASF dual-hosted git repository.

zhouxzhan pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8a9380dda [ISSUR #5941] Fix the problem that acl is not loaded when 
the proxy starts
8a9380dda is described below

commit 8a9380dda67a598938fc3f1fcfcbeb4c847e1e77
Author: zzjcool <em...@zzj.cool>
AuthorDate: Sun Jan 29 03:43:44 2023 +0000

    [ISSUR #5941] Fix the problem that acl is not loaded when the proxy starts
---
 proxy/pom.xml                                                      | 4 ++++
 .../apache/rocketmq/proxy/processor/DefaultMessagingProcessor.java | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/proxy/pom.xml b/proxy/pom.xml
index f5373e914..dff54a22e 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -53,6 +53,10 @@
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-acl</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/processor/DefaultMessagingProcessor.java
 
b/proxy/src/main/java/org/apache/rocketmq/proxy/processor/DefaultMessagingProcessor.java
index 66239f0e8..674eced91 100644
--- 
a/proxy/src/main/java/org/apache/rocketmq/proxy/processor/DefaultMessagingProcessor.java
+++ 
b/proxy/src/main/java/org/apache/rocketmq/proxy/processor/DefaultMessagingProcessor.java
@@ -22,6 +22,8 @@ import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+
+import org.apache.rocketmq.acl.common.AclUtils;
 import org.apache.rocketmq.broker.BrokerController;
 import org.apache.rocketmq.broker.client.ClientChannelInfo;
 import org.apache.rocketmq.broker.client.ConsumerGroupInfo;
@@ -31,6 +33,7 @@ import org.apache.rocketmq.client.consumer.AckResult;
 import org.apache.rocketmq.client.consumer.PopResult;
 import org.apache.rocketmq.client.consumer.PullResult;
 import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
 import org.apache.rocketmq.common.consumer.ReceiptHandle;
 import org.apache.rocketmq.common.message.Message;
@@ -64,6 +67,8 @@ public class DefaultMessagingProcessor extends 
AbstractStartAndShutdown implemen
 
     protected ThreadPoolExecutor producerProcessorExecutor;
     protected ThreadPoolExecutor consumerProcessorExecutor;
+    protected static final String ROCKETMQ_HOME = 
System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
+            System.getenv(MixAll.ROCKETMQ_HOME_ENV));
 
     protected DefaultMessagingProcessor(ServiceManager serviceManager) {
         ProxyConfig proxyConfig = ConfigurationManager.getProxyConfig();
@@ -103,7 +108,7 @@ public class DefaultMessagingProcessor extends 
AbstractStartAndShutdown implemen
     }
 
     public static DefaultMessagingProcessor createForClusterMode() {
-        return createForClusterMode(null);
+        return createForClusterMode(AclUtils.getAclRPCHook(ROCKETMQ_HOME + 
MixAll.ACL_CONF_TOOLS_FILE));
     }
 
     public static DefaultMessagingProcessor createForClusterMode(RPCHook 
rpcHook) {