Skip to content

[ISSUE #10985] Handle exceptional POP revive reads without losing retry #10986

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
ai-yang wants to merge 1 commit into
base: develop
Choose a base branch
from
+36 −1
Open

[ISSUE #10985] Handle exceptional POP revive reads without losing retry #10986

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
8 changes: 7 additions & 1 deletion 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 @@ -568,7 +568,13 @@ private void reviveMsgFromCk(PopCheckPoint popCheckPoint) {
// retry msg
long msgOffset = popCheckPoint.ackOffsetByIndex((byte) j);
CompletableFuture<Pair<Long, Boolean>> future = getBizMessage(popCheckPoint, msgOffset)
.thenApply(rst -> {
.handle((rst, throwable) -> {
if (throwable != null) {
POP_LOGGER.error("reviveQueueId={}, get biz msg failed, topic:{}, qid:{}, offset:{}, brokerName:{}",
queueId, popCheckPoint.getTopic(), popCheckPoint.getQueueId(), msgOffset,
popCheckPoint.getBrokerName(), throwable);
return new Pair<>(msgOffset, false);
}
MessageExt message = rst.getLeft();
if (message == null) {
POP_LOGGER.info("reviveQueueId={}, can not get biz msg, topic:{}, qid:{}, offset:{}, brokerName:{}, info:{}, retry:{}, then continue",
Expand Down
29 changes: 29 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/processor/PopReviveServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.rocketmq.broker.processor;

import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.broker.failover.EscapeBridge;
Expand Down Expand Up @@ -58,6 +59,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.NavigableMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
Expand Down Expand Up @@ -389,6 +391,33 @@ public void testReviveMsgFromCk_messageNotFound_needRetry() throws Throwable {
verify(messageStore, times(1)).putMessage(any(MessageExtBrokerInner.class)); // rewrite CK
}

@Test
public void testReviveMsgFromCk_getBizMessageExceptional_rewriteCK() throws Throwable {
PopCheckPoint ck = buildPopCheckPoint(0, 0, 1);
PopReviveService.ConsumeReviveObj reviveObj = new PopReviveService.ConsumeReviveObj();
reviveObj.map.put("", ck);
reviveObj.endTime = System.currentTimeMillis();

ArgumentCaptor<Long> commitOffsetCaptor = ArgumentCaptor.forClass(Long.class);
doNothing().when(consumerOffsetManager).commitOffset(anyString(), anyString(), anyString(), anyInt(),
commitOffsetCaptor.capture());

CompletableFuture<Triple<MessageExt, String, Boolean>> failed = new CompletableFuture<>();
failed.completeExceptionally(new RuntimeException("store read failed"));
when(escapeBridge.getMessageAsync(anyString(), anyLong(), anyInt(), anyString(), anyBoolean()))
.thenReturn(failed);

popReviveService.mergeAndRevive(reviveObj);

NavigableMap<?, ?> inflight = (NavigableMap<?, ?>) FieldUtils.readField(
popReviveService, "inflightReviveRequestMap", true);
assertEquals(1, reviveObj.newOffset);
assertEquals(1, commitOffsetCaptor.getValue().longValue());
assertEquals(0, inflight.size());
// An exceptional async read must retain retryability by rewriting the checkpoint.
verify(messageStore, times(1)).putMessage(any(MessageExtBrokerInner.class));
}

@Test
public void testReviveMsgFromCk_messageNotFound_needRetry_end() throws Throwable {
brokerConfig.setSkipWhenCKRePutReachMaxTimes(true);
Expand Down
Loading