Skip to content

[ISSUE #10849] fix(remoting): avoid static topic epoch sort overflow #10854

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

Open
yuluo-yx wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[ISSUE #10849] fix(remoting): avoid static topic epoch sort overflow #10854

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
2 changes: 1 addition & 1 deletion ...c/main/java/org/apache/rocketmq/remoting/protocol/statictopic/TopicQueueMappingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ public static void checkPhysicalQueueConsistence(Map<String, TopicConfigAndQueu


public static Map<Integer, TopicQueueMappingOne> checkAndBuildMappingItems(List<TopicQueueMappingDetail> mappingDetailList, boolean replace, boolean checkConsistence) {
mappingDetailList.sort((o1, o2) -> (int) (o2.getEpoch() - o1.getEpoch()));
mappingDetailList.sort((o1, o2) -> Long.compare(o2.getEpoch(), o1.getEpoch()));

int maxNum = 0;
Map<Integer, TopicQueueMappingOne> globalIdMap = new HashMap<>();
Expand Down
2 changes: 1 addition & 1 deletion remoting/src/main/java/org/apache/rocketmq/remoting/rpc/ClientMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public static ConcurrentMap<MessageQueue, String> topicRouteData2EndpointsForSta
Map<String, TopicQueueMappingInfo> topicQueueMappingInfoMap = mapEntry.getValue();
ConcurrentMap<MessageQueue, TopicQueueMappingInfo> mqEndPoints = new ConcurrentHashMap<>();
List<Map.Entry<String, TopicQueueMappingInfo>> mappingInfos = new ArrayList<>(topicQueueMappingInfoMap.entrySet());
mappingInfos.sort((o1, o2) -> (int) (o2.getValue().getEpoch() - o1.getValue().getEpoch()));
mappingInfos.sort((o1, o2) -> Long.compare(o2.getValue().getEpoch(), o1.getValue().getEpoch()));
int maxTotalNums = 0;
long maxTotalNumOfEpoch = -1;
for (Map.Entry<String, TopicQueueMappingInfo> entry : mappingInfos) {
Expand Down
17 changes: 17 additions & 0 deletions ...st/java/org/apache/rocketmq/remoting/protocol/statictopic/TopicQueueMappingUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,23 @@

public class TopicQueueMappingUtilsTest {

@Test
public void testCheckAndBuildMappingItemsChoosesLatestEpochWithoutOverflow() {
TopicQueueMappingDetail latest = buildMappingDetail("latest", Long.MAX_VALUE);
TopicQueueMappingDetail stale = buildMappingDetail("stale", 0);

Map<Integer, TopicQueueMappingOne> result = TopicQueueMappingUtils.checkAndBuildMappingItems(
new ArrayList<>(java.util.Arrays.asList(latest, stale)), true, false);

Assert.assertEquals("latest", result.get(0).getBname());
}

private TopicQueueMappingDetail buildMappingDetail(String brokerName, long epoch) {
TopicQueueMappingDetail detail = new TopicQueueMappingDetail("topic", 1, brokerName, epoch);
LogicQueueMappingItem item = new LogicQueueMappingItem(0, 0, brokerName, 0, 0, -1, -1, -1);
detail.getHostedQueues().put(0, new ArrayList<>(Collections.singletonList(item)));
return detail;
}

private Set<String> buildTargetBrokers(int num) {
return buildTargetBrokers(num, "");
Expand Down
Loading