opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-09-01 15:47:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ISSUE #5485] Fix by code review

Browse Source
This commit is contained in:
zhouxiang
2022-12-06 14:24:34 +08:00
committed by Zhouxiang Zhan
parent 23c8efd801
commit b713aebfa7
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/org/apache/rocketmq/common/attribute/TopicMessageType.java
+1 -2
View File
@@ -53,9 +53,8 @@ public enum TopicMessageType {
return TopicMessageType.DELAY;
} else if (messageProperty.get(MessageConst.PROPERTY_SHARDING_KEY) != null) {
return TopicMessageType.FIFO;
} else {
return TopicMessageType.NORMAL;
}
return TopicMessageType.NORMAL;
}
public String getMetricsValue() {
proxy/src/main/java/org/apache/rocketmq/proxy/service/message/ClusterMessageService.java
+5 -8
View File
@@ -30,6 +30,7 @@ import org.apache.rocketmq.common.message.MessageQueue;
import org.apache.rocketmq.proxy.common.ProxyContext;
import org.apache.rocketmq.proxy.common.ProxyException;
import org.apache.rocketmq.proxy.common.ProxyExceptionCode;
import org.apache.rocketmq.proxy.common.utils.FutureUtils;
import org.apache.rocketmq.proxy.service.mqclient.MQClientAPIFactory;
import org.apache.rocketmq.proxy.service.route.AddressableMessageQueue;
import org.apache.rocketmq.proxy.service.route.TopicRouteService;
@@ -212,10 +213,8 @@ public class ClusterMessageService implements MessageService {
try {
String brokerAddress = topicRouteService.getBrokerAddr(brokerName);
return mqClientAPIFactory.getClient().invoke(brokerAddress, request, timeoutMillis);
} catch (Exception e) {
CompletableFuture<RemotingCommand> future = new CompletableFuture<>();
future.completeExceptionally(e);
return future;
} catch (Throwable t) {
return FutureUtils.completeExceptionally(t);
}
}
@@ -225,10 +224,8 @@ public class ClusterMessageService implements MessageService {
try {
String brokerAddress = topicRouteService.getBrokerAddr(brokerName);
return mqClientAPIFactory.getClient().invokeOneway(brokerAddress, request, timeoutMillis);
} catch (Exception e) {
CompletableFuture<Void> future = new CompletableFuture<>();
future.completeExceptionally(e);
return future;
} catch (Throwable t) {
return FutureUtils.completeExceptionally(t);
}
}