You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2021/11/05 01:05:06 UTC
[rocketmq-dashboard] branch master updated: [ISSUE #38]update
rocketmq version. (#39)
This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 2160e23 [ISSUE #38]update rocketmq version. (#39)
2160e23 is described below
commit 2160e23b917824905d12567090da568fbc08a1c7
Author: zhangjidi2016 <10...@qq.com>
AuthorDate: Fri Nov 5 09:04:59 2021 +0800
[ISSUE #38]update rocketmq version. (#39)
Co-authored-by: zhangjidi2016 <zh...@cmss.chinamobile.com>
---
pom.xml | 2 +-
.../dashboard/service/client/MQAdminExtImpl.java | 22 +++++++++-
.../dashboard/service/impl/TopicServiceImpl.java | 2 +-
.../dashboard/admin/MQAdminExtImplTest.java | 48 +++++++++++++++++-----
4 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ebb77a..b2a7c52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-io.version>2.4</commons-io.version>
<commons-cli.version>1.2</commons-cli.version>
- <rocketmq.version>4.9.0</rocketmq.version>
+ <rocketmq.version>4.9.2</rocketmq.version>
<surefire.version>2.19.1</surefire.version>
<aspectj.version>1.9.6</aspectj.version>
<lombok.version>1.18.12</lombok.version>
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java
index 81e1202..6b99e7a 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java
@@ -236,6 +236,12 @@ public class MQAdminExtImpl implements MQAdminExt {
}
@Override
+ public int addWritePermOfBroker(String namesrvAddr,
+ String brokerName) throws RemotingCommandException, RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQClientException {
+ return MQAdminInstance.threadLocalMQAdminExt().addWritePermOfBroker(namesrvAddr, brokerName);
+ }
+
+ @Override
public void putKVConfig(String namespace, String key, String value) {
MQAdminInstance.threadLocalMQAdminExt().putKVConfig(namespace, key, value);
}
@@ -511,9 +517,21 @@ public class MQAdminExtImpl implements MQAdminExt {
}
@Override
- public TopicConfigSerializeWrapper getAllTopicGroup(String brokerAddr,
+ public SubscriptionGroupWrapper getUserSubscriptionGroup(String brokerAddr,
+ long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQBrokerException {
+ return MQAdminInstance.threadLocalMQAdminExt().getUserSubscriptionGroup(brokerAddr, timeoutMillis);
+ }
+
+ @Override
+ public TopicConfigSerializeWrapper getAllTopicConfig(String brokerAddr,
long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQBrokerException {
- return MQAdminInstance.threadLocalMQAdminExt().getAllTopicGroup(brokerAddr, timeoutMillis);
+ return MQAdminInstance.threadLocalMQAdminExt().getAllTopicConfig(brokerAddr, timeoutMillis);
+ }
+
+ @Override
+ public TopicConfigSerializeWrapper getUserTopicConfig(String brokerAddr, boolean specialTopic,
+ long timeoutMillis) throws InterruptedException, RemotingException, MQBrokerException, MQClientException {
+ return MQAdminInstance.threadLocalMQAdminExt().getUserTopicConfig(brokerAddr, specialTopic, timeoutMillis);
}
@Override
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java
index b6197b7..9dfde72 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java
@@ -135,10 +135,10 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
ClusterInfo clusterInfo = null;
try {
clusterInfo = mqAdminExt.examineBrokerClusterInfo();
+ return mqAdminExt.examineTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topic);
} catch (Exception e) {
throw Throwables.propagate(e);
}
- return mqAdminExt.examineTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topic);
}
@Override
diff --git a/src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java b/src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java
index 28a898d..9cafc8f 100644
--- a/src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java
+++ b/src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java
@@ -759,16 +759,6 @@ public class MQAdminExtImplTest {
}
@Test
- public void testGetAllTopicGroup() throws Exception {
- assertNotNull(mqAdminExtImpl);
- {
- when(defaultMQAdminExt.getAllTopicGroup(anyString(), anyLong())).thenReturn(new TopicConfigSerializeWrapper());
- }
- TopicConfigSerializeWrapper wrapper = mqAdminExtImpl.getAllTopicGroup(brokerAddr, 5000L);
- Assert.assertNotNull(wrapper);
- }
-
- @Test
public void testUpdateConsumeOffset() throws Exception {
assertNotNull(mqAdminExtImpl);
{
@@ -801,4 +791,42 @@ public class MQAdminExtImplTest {
Assert.assertFalse(mqAdminExtImpl.resumeCheckHalfMessage("topic_test", "7F000001ACC018B4AAC2116AF6500000"));
}
+ @Test
+ public void testAddWritePermOfBroker() throws Exception {
+ assertNotNull(mqAdminExtImpl);
+ {
+ when(defaultMQAdminExt.addWritePermOfBroker(anyString(), anyString())).thenReturn(6);
+ }
+ Assert.assertEquals(mqAdminExtImpl.addWritePermOfBroker("127.0.0.1:9876", "broker-a"), 6);
+ }
+
+ @Test
+ public void testGetUserSubscriptionGroup() throws Exception {
+ assertNotNull(mqAdminExtImpl);
+ SubscriptionGroupWrapper wrapper = new SubscriptionGroupWrapper();
+ {
+ when(defaultMQAdminExt.getUserSubscriptionGroup(anyString(), anyLong())).thenReturn(wrapper);
+ }
+ Assert.assertEquals(mqAdminExtImpl.getUserSubscriptionGroup("127.0.0.1:10911", 3000), wrapper);
+ }
+
+ @Test
+ public void testGetAllTopicConfig() throws Exception {
+ assertNotNull(mqAdminExtImpl);
+ TopicConfigSerializeWrapper wrapper = new TopicConfigSerializeWrapper();
+ {
+ when(defaultMQAdminExt.getAllTopicConfig(anyString(), anyLong())).thenReturn(wrapper);
+ }
+ Assert.assertEquals(mqAdminExtImpl.getAllTopicConfig("127.0.0.1:10911", 3000), wrapper);
+ }
+
+ @Test
+ public void testGetUserTopicConfig() throws Exception {
+ assertNotNull(mqAdminExtImpl);
+ TopicConfigSerializeWrapper wrapper = new TopicConfigSerializeWrapper();
+ {
+ when(defaultMQAdminExt.getUserTopicConfig(anyString(), anyBoolean(), anyLong())).thenReturn(wrapper);
+ }
+ Assert.assertEquals(mqAdminExtImpl.getUserTopicConfig("127.0.0.1:10911", true, 3000), wrapper);
+ }
}