You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by vo...@apache.org on 2021/09/27 01:08:03 UTC
[rocketmq] branch develop updated: [ISSUE #503] NOT_CONSUME_YET not
righht in RocketMQ Console (#3091)
This is an automated email from the ASF dual-hosted git repository.
vongosling 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 daf1b9d [ISSUE #503] NOT_CONSUME_YET not righht in RocketMQ Console (#3091)
daf1b9d is described below
commit daf1b9df79aea5614d740cc46e6d7dd95ce038c4
Author: 孙不服 <su...@apache.org>
AuthorDate: Mon Sep 27 09:07:59 2021 +0800
[ISSUE #503] NOT_CONSUME_YET not righht in RocketMQ Console (#3091)
---
.../java/org/apache/rocketmq/common/RemotingUtilTest.java | 12 ++++++++++++
.../org/apache/rocketmq/remoting/common/RemotingUtil.java | 4 ++++
.../apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java | 2 +-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/common/src/test/java/org/apache/rocketmq/common/RemotingUtilTest.java b/common/src/test/java/org/apache/rocketmq/common/RemotingUtilTest.java
index 5866896..19346e6 100644
--- a/common/src/test/java/org/apache/rocketmq/common/RemotingUtilTest.java
+++ b/common/src/test/java/org/apache/rocketmq/common/RemotingUtilTest.java
@@ -28,4 +28,16 @@ public class RemotingUtilTest {
assertThat(localAddress).isNotNull();
assertThat(localAddress.length()).isGreaterThan(0);
}
+
+ @Test
+ public void testConvert2IpStringWithIp() {
+ String result = RemotingUtil.convert2IpString("127.0.0.1:9876");
+ assertThat(result).isEqualTo("127.0.0.1:9876");
+ }
+
+ @Test
+ public void testConvert2IpStringWithHost() {
+ String result = RemotingUtil.convert2IpString("localhost:9876");
+ assertThat(result).isEqualTo("127.0.0.1:9876");
+ }
}
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingUtil.java b/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingUtil.java
index d936c3b..3914314 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingUtil.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingUtil.java
@@ -165,6 +165,10 @@ public class RemotingUtil {
return sb.toString();
}
+ public static String convert2IpString(final String addr) {
+ return socketAddress2String(string2SocketAddress(addr));
+ }
+
private static boolean isBridge(NetworkInterface networkInterface) {
try {
if (isLinuxPlatform()) {
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
index 55cca54..d0e65ba 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
@@ -888,7 +888,7 @@ public class DefaultMQAdminExtImpl implements MQAdminExt, MQAdminExtInner {
if (mq.getTopic().equals(msg.getTopic()) && mq.getQueueId() == msg.getQueueId()) {
BrokerData brokerData = ci.getBrokerAddrTable().get(mq.getBrokerName());
if (brokerData != null) {
- String addr = brokerData.getBrokerAddrs().get(MixAll.MASTER_ID);
+ String addr = RemotingUtil.convert2IpString(brokerData.getBrokerAddrs().get(MixAll.MASTER_ID));
if (RemotingUtil.socketAddress2String(msg.getStoreHost()).equals(addr)) {
if (next.getValue().getConsumerOffset() > msg.getQueueOffset()) {
return true;