Skip to content

[ISSUE #402] Add proxy fallback for request codes 106/206 not supported #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
itxaiohanglover wants to merge 1 commit into from
Closed

[ISSUE #402] Add proxy fallback for request codes 106/206 not supported #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/main/java/org/apache/rocketmq/dashboard/service/ClusterInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import jakarta.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.dashboard.config.RMQConfigure;
import org.apache.rocketmq.dashboard.service.client.ProxyAdmin;
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
import org.apache.rocketmq.tools.admin.MQAdminExt;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -36,6 +38,12 @@ public class ClusterInfoService {
@Autowired
private MQAdminExt mqAdminExt;

@Autowired
private ProxyAdmin proxyAdmin;

@Autowired
private RMQConfigure configure;

@Value("${rocketmq.cluster.cache.expire:60000}")
private long cacheExpireMs;

Expand All @@ -61,7 +69,17 @@ public synchronized ClusterInfo refresh() {
cachedRef.set(fresh);
return fresh;
} catch (Exception e) {
log.warn("Refresh cluster info failed", e);
log.warn("Refresh cluster info via mqAdminExt failed, trying proxy: {}", e.getMessage());
try {
String proxyAddr = configure.getProxyAddr();
if (proxyAddr != null && !proxyAddr.isEmpty()) {
ClusterInfo fresh = proxyAdmin.getBrokerClusterInfo(proxyAddr);
cachedRef.set(fresh);
return fresh;
}
} catch (Exception proxyEx) {
log.warn("Refresh cluster info via proxy also failed", proxyEx);
}
ClusterInfo old = cachedRef.get();
if (old != null) {
return old;
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/apache/rocketmq/dashboard/service/client/ProxyAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,15 @@
import org.apache.rocketmq.remoting.exception.RemotingConnectException;
import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
import org.apache.rocketmq.remoting.protocol.body.TopicList;

public interface ProxyAdmin {

ConsumerConnection examineConsumerConnectionInfo(String addr, String consumerGroup) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQBrokerException;

ClusterInfo getBrokerClusterInfo(String addr) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQBrokerException;

TopicList getAllTopicListFromNameServer(String addr) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQBrokerException;
}
40 changes: 40 additions & 0 deletions src/main/java/org/apache/rocketmq/dashboard/service/client/ProxyAdminImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,14 @@
import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
import org.apache.rocketmq.remoting.protocol.body.TopicList;
import org.apache.rocketmq.remoting.protocol.header.GetConsumerConnectionListRequestHeader;
import org.springframework.stereotype.Service;

import static org.apache.rocketmq.remoting.protocol.RequestCode.GET_BROKER_CLUSTER_INFO;
import static org.apache.rocketmq.remoting.protocol.RequestCode.GET_ALL_TOPIC_LIST_FROM_NAMESERVER;
import static org.apache.rocketmq.remoting.protocol.RequestCode.GET_CONSUMER_CONNECTION_LIST;

@Slf4j
Expand All @@ -52,4 +56,40 @@ public ConsumerConnection examineConsumerConnectionInfo(String addr, String cons
throw e;
}
}

@Override
public ClusterInfo getBrokerClusterInfo(String addr) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQBrokerException {
try {
RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
RemotingCommand request = RemotingCommand.createRequestCommand(GET_BROKER_CLUSTER_INFO, null);
RemotingCommand response = remotingClient.invokeSync(addr, request, 3000);
switch (response.getCode()) {
case 0:
return ClusterInfo.decode(response.getBody(), ClusterInfo.class);
default:
throw new MQBrokerException(response.getCode(), response.getRemark(), addr);
}
} catch (Exception e) {
log.error("getBrokerClusterInfo error", e);
throw e;
}
}

@Override
public TopicList getAllTopicListFromNameServer(String addr) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQBrokerException {
try {
RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
RemotingCommand request = RemotingCommand.createRequestCommand(GET_ALL_TOPIC_LIST_FROM_NAMESERVER, null);
RemotingCommand response = remotingClient.invokeSync(addr, request, 3000);
switch (response.getCode()) {
case 0:
return TopicList.decode(response.getBody(), TopicList.class);
default:
throw new MQBrokerException(response.getCode(), response.getRemark(), addr);
}
} catch (Exception e) {
log.error("getAllTopicListFromNameServer error", e);
throw e;
}
}
}
18 changes: 17 additions & 1 deletion src/main/java/org/apache/rocketmq/dashboard/service/impl/ClusterServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
import com.google.common.collect.Maps;
import jakarta.annotation.Resource;
import org.apache.rocketmq.common.attribute.TopicMessageType;
import org.apache.rocketmq.dashboard.config.RMQConfigure;
import org.apache.rocketmq.dashboard.service.ClusterService;
import org.apache.rocketmq.dashboard.service.client.ProxyAdmin;
import org.apache.rocketmq.dashboard.util.JsonUtil;
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
import org.apache.rocketmq.remoting.protocol.body.KVTable;
Expand All @@ -41,12 +43,26 @@ public class ClusterServiceImpl implements ClusterService {
private Logger logger = LoggerFactory.getLogger(ClusterServiceImpl.class);
@Resource
private MQAdminExt mqAdminExt;
@Resource
private ProxyAdmin proxyAdmin;
@Resource
private RMQConfigure configure;

@Override
public Map<String, Object> list() {
try {
Map<String, Object> resultMap = Maps.newHashMap();
ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo();
ClusterInfo clusterInfo;
try {
clusterInfo = mqAdminExt.examineBrokerClusterInfo();
} catch (Exception e) {
logger.warn("examineBrokerClusterInfo failed, trying proxy: {}", e.getMessage());
String proxyAddr = configure.getProxyAddr();
if (proxyAddr == null || proxyAddr.isEmpty()) {
throw e;
}
clusterInfo = proxyAdmin.getBrokerClusterInfo(proxyAddr);
}
logger.info("op=look_clusterInfo {}", JsonUtil.obj2String(clusterInfo));
Map<String/*brokerName*/, Map<Long/* brokerId */, Object/* brokerDetail */>> brokerServer = Maps.newHashMap();
for (BrokerData brokerData : clusterInfo.getBrokerAddrTable().values()) {
Expand Down
18 changes: 16 additions & 2 deletions src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@
import org.apache.rocketmq.client.trace.TraceDispatcher;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.TopicConfig;
import org.apache.rocketmq.dashboard.config.RMQConfigure;
import org.apache.rocketmq.dashboard.service.client.ProxyAdmin;
import org.apache.rocketmq.common.attribute.TopicMessageType;
import org.apache.rocketmq.common.message.Message;
import org.apache.rocketmq.common.message.MessageExt;
import org.apache.rocketmq.common.topic.TopicValidator;
import org.apache.rocketmq.dashboard.config.RMQConfigure;
import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
import org.apache.rocketmq.dashboard.model.request.TopicTypeList;
Expand Down Expand Up @@ -90,10 +91,23 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
@Autowired
private RMQConfigure configure;

@Autowired
private ProxyAdmin proxyAdmin;

@Override
public TopicList fetchAllTopicList(boolean skipSysProcess, boolean skipRetryAndDlq) {
try {
TopicList allTopics = mqAdminExt.fetchAllTopicList();
TopicList allTopics;
try {
allTopics = mqAdminExt.fetchAllTopicList();
} catch (Exception e) {
logger.warn("fetchAllTopicList failed, trying proxy: {}", e.getMessage());
String proxyAddr = configure.getProxyAddr();
if (proxyAddr == null || proxyAddr.isEmpty()) {
throw e;
}
allTopics = proxyAdmin.getAllTopicListFromNameServer(proxyAddr);
}
TopicList sysTopics = getSystemTopicList();
Set<String> topics =
allTopics.getTopicList().stream().map(topic -> {
Expand Down