Skip to content

fix: infinite loop in getBulkData, CME in PopReviveService, and NPEs in broker client code #10732

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
yyqdbngt wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: infinite loop in getBulkData, CME in PopReviveService, and NPEs in broker client code #10732

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
4 changes: 2 additions & 2 deletions broker/src/main/java/org/apache/rocketmq/broker/client/net/Broker2Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ public RemotingCommand getConsumeStatus(String topic, String group, String origi
requestHeader);

Map<String, Map<MessageQueue, Long>> consumerStatusTable = new HashMap<>();
ConcurrentMap<Channel, ClientChannelInfo> channelInfoTable =
this.brokerController.getConsumerManager().getConsumerGroupInfo(group).getChannelInfoTable();
ConsumerGroupInfo consumerGroupInfo = this.brokerController.getConsumerManager().getConsumerGroupInfo(group);
ConcurrentMap<Channel, ClientChannelInfo> channelInfoTable = consumerGroupInfo == null ? null : consumerGroupInfo.getChannelInfoTable();
if (null == channelInfoTable || channelInfoTable.isEmpty()) {
result.setCode(ResponseCode.SYSTEM_ERROR);
result.setRemark(String.format("No Any Consumer online in the consumer group: [%s]", group));
Expand Down
9 changes: 7 additions & 2 deletions broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
Expand Down Expand Up @@ -592,12 +593,16 @@ private void reviveMsgFromCk(PopCheckPoint popCheckPoint) {
if (inflightReviveRequestMap.containsKey(popCheckPoint)) {
inflightReviveRequestMap.get(popCheckPoint).setObject2(true);
}
for (Map.Entry<PopCheckPoint, Pair<Long, Boolean>> entry : inflightReviveRequestMap.entrySet()) {
// Use the iterator to remove entries: directly calling map.remove() while
// iterating over the fail-fast TreeMap iterator throws ConcurrentModificationException.
Iterator<Map.Entry<PopCheckPoint, Pair<Long, Boolean>>> iterator = inflightReviveRequestMap.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<PopCheckPoint, Pair<Long, Boolean>> entry = iterator.next();
PopCheckPoint oldCK = entry.getKey();
Pair<Long, Boolean> pair = entry.getValue();
if (pair.getObject2()) {
brokerController.getConsumerOffsetManager().commitOffset(PopAckConstants.LOCAL_HOST, PopAckConstants.REVIVE_GROUP, reviveTopic, queueId, oldCK.getReviveOffset());
inflightReviveRequestMap.remove(oldCK);
iterator.remove();
} else {
break;
}
Expand Down
3 changes: 3 additions & 0 deletions store/src/main/java/org/apache/rocketmq/store/CommitLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,9 @@ public List<SelectMappedBufferResult> getBulkData(final long offset, final int s
bufferResultList.add(bufferResult);
remainSize -= readSize;
startOffset += readSize;
} else {
log.warn("getBulkData: can not find mapped file by offset, break to avoid infinite loop. offset: {}, size: {}", startOffset, remainSize);
break;
}
}

Expand Down