Skip to content

[ISSUE #10229] Fix server-side reset offset does not take effect for FIFO (orderly) pop consumers #10230

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

Merged
lizhimins merged 2 commits into from
Mar 30, 2026
Merged

[ISSUE #10229] Fix server-side reset offset does not take effect for FIFO (orderly) pop consumers #10230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cde20fc
fix-reset-offset-pop-orderly
qianye1001 Mar 30, 2026
c5dcc7a
fix
qianye1001 Mar 30, 2026
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
41 changes: 23 additions & 18 deletions broker/src/main/java/org/apache/rocketmq/broker/pop/PopConsumerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,23 @@
import com.alibaba.fastjson2.JSON;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Stopwatch;
import java.nio.ByteBuffer;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.Queue;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.rocketmq.broker.BrokerController;
Expand Down Expand Up @@ -52,24 +69,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.nio.ByteBuffer;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.Queue;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;

public class PopConsumerService extends ServiceThread {

private static final Logger log = LoggerFactory.getLogger(LoggerName.ROCKETMQ_POP_LOGGER_NAME);
Expand Down Expand Up @@ -287,6 +286,12 @@ public void setFifoBlocked(PopConsumerContext context,
}

public boolean isFifoBlocked(PopConsumerContext context, String groupId, String topicId, int queueId) {
// If server-side reset offset is enabled, and there is a reset offset,
// then return false to make sure that the reset offset takes effect.
if (brokerController.getBrokerConfig().isUseServerSideResetOffset() &&
this.brokerController.getConsumerOffsetManager().hasOffsetReset(topicId, groupId, queueId)) {
return false;
}
return brokerController.getConsumerOrderInfoManager().checkBlock(
context.getAttemptId(), topicId, groupId, queueId, context.getInvisibleTime());
}
Expand Down
Loading