[rocketmq] branch develop updated: [ISSUE #5941] Add proxyConfig enableAclRpcHookForClusterMode

[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 9fc503804 [ISSUE #5941] Add proxyConfig enableAclRpcHookForClusterMode
9fc503804 is described below

commit 9fc503804682f9a1de63133573562a369f378748
Author: zhouxiang <zhouxiang....@alibaba-inc.com>
AuthorDate: Wed Feb 15 17:45:11 2023 +0800

    [ISSUE #5941] Add proxyConfig enableAclRpcHookForClusterMode
    
    * Add proxyConfig `enableAclRpcHookForClusterMode` because not all the 
proxy needs to bring acl info
---
 .../java/org/apache/rocketmq/proxy/config/ProxyConfig.java     | 10 ++++++++++
 .../rocketmq/proxy/processor/DefaultMessagingProcessor.java    |  6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java 
b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
index ef8d4ad30..1de7a1ebf 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
@@ -185,6 +185,8 @@ public class ProxyConfig implements ConfigFile {
 
     private boolean enableACL = false;
 
+    private boolean enableAclRpcHookForClusterMode = false;
+
     private boolean useDelayLevel = true;
     private String messageDelayLevel = "1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 
9m 10m 20m 30m 1h 2h";
     private transient Map<Integer /* level */, Long/* delay timeMillis */> 
delayLevelTable = new ConcurrentHashMap<>();
@@ -927,6 +929,14 @@ public class ProxyConfig implements ConfigFile {
         this.enableACL = enableACL;
     }
 
+    public boolean isEnableAclRpcHookForClusterMode() {
+        return enableAclRpcHookForClusterMode;
+    }
+
+    public void setEnableAclRpcHookForClusterMode(boolean 
enableAclRpcHookForClusterMode) {
+        this.enableAclRpcHookForClusterMode = enableAclRpcHookForClusterMode;
+    }
+
     public boolean isEnableTopicMessageTypeCheck() {
         return enableTopicMessageTypeCheck;
     }
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 674eced91..b9800d0cc 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
@@ -108,7 +108,11 @@ public class DefaultMessagingProcessor extends 
AbstractStartAndShutdown implemen
     }
 
     public static DefaultMessagingProcessor createForClusterMode() {
-        return createForClusterMode(AclUtils.getAclRPCHook(ROCKETMQ_HOME + 
MixAll.ACL_CONF_TOOLS_FILE));
+        RPCHook rpcHook = null;
+        if 
(ConfigurationManager.getProxyConfig().isEnableAclRpcHookForClusterMode()) {
+            rpcHook = AclUtils.getAclRPCHook(ROCKETMQ_HOME + 
MixAll.ACL_CONF_TOOLS_FILE);
+        }
+        return createForClusterMode(rpcHook);
     }
 
     public static DefaultMessagingProcessor createForClusterMode(RPCHook 
rpcHook) {