vongosling closed pull request #132: [ROCKETMQ-248] make ConsumeFromWhere work
right
URL: https://github.com/apache/rocketmq/pull/132
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java
b/broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java
index bb427050d..7bc20f0a1 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java
@@ -18,6 +18,8 @@
import io.netty.channel.ChannelHandlerContext;
import java.util.List;
+import java.util.Map;
+
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.broker.client.ConsumerGroupInfo;
import org.apache.rocketmq.common.constant.LoggerName;
@@ -125,27 +127,39 @@ private RemotingCommand
queryConsumerOffset(ChannelHandlerContext ctx, RemotingC
(QueryConsumerOffsetRequestHeader) request
.decodeCommandCustomHeader(QueryConsumerOffsetRequestHeader.class);
+ String topicName = requestHeader.getTopic();
+ int queueId = requestHeader.getQueueId();
+ String consumerGroupName = requestHeader.getConsumerGroup();
+
long offset =
this.brokerController.getConsumerOffsetManager().queryOffset(
- requestHeader.getConsumerGroup(), requestHeader.getTopic(),
requestHeader.getQueueId());
+ consumerGroupName, topicName, queueId);
if (offset >= 0) {
+ log.info("Offset found. topic = {}, queueId = {}, group = {},
offset = {}",
+ topicName, queueId, consumerGroupName, offset);
+
responseHeader.setOffset(offset);
response.setCode(ResponseCode.SUCCESS);
- response.setRemark(null);
} else {
- long minOffset =
-
this.brokerController.getMessageStore().getMinOffsetInQueue(requestHeader.getTopic(),
- requestHeader.getQueueId());
- if (minOffset <= 0
- &&
!this.brokerController.getMessageStore().checkInDiskByConsumeOffset(
- requestHeader.getTopic(), requestHeader.getQueueId(), 0)) {
+ Map<Integer, Long> offsetTable =
+ brokerController.getConsumerOffsetManager().queryOffset(
+ requestHeader.getConsumerGroup(),
requestHeader.getTopic());
+ // brand new subscription
+ if (offsetTable == null) {
+ log.info("Might be a new subscription. topic = {}, queueId =
{}, group = {}",
+ topicName, queueId, consumerGroupName);
+
+ response.setCode(ResponseCode.QUERY_NOT_FOUND);
+ response.setRemark("Offset not found. The subscription is
probably new.");
+ }
+ // new scaled queue
+ else {
+ log.info("Might be a new scaled queue. topic = {}, queueId =
{}, group = {}",
+ topicName, queueId, consumerGroupName);
+
responseHeader.setOffset(0L);
response.setCode(ResponseCode.SUCCESS);
- response.setRemark(null);
- } else {
- response.setCode(ResponseCode.QUERY_NOT_FOUND);
- response.setRemark("Not found, V3_0_6_SNAPSHOT maybe this
group consumer boot first");
}
}
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessorTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessorTest.java
new file mode 100644
index 000000000..1694d4122
--- /dev/null
+++
b/broker/src/test/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessorTest.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.rocketmq.broker.processor;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.rocketmq.broker.BrokerController;
+import org.apache.rocketmq.common.BrokerConfig;
+import org.apache.rocketmq.common.protocol.RequestCode;
+import org.apache.rocketmq.common.protocol.ResponseCode;
+import
org.apache.rocketmq.common.protocol.header.QueryConsumerOffsetRequestHeader;
+import
org.apache.rocketmq.common.protocol.header.QueryConsumerOffsetResponseHeader;
+import org.apache.rocketmq.remoting.netty.NettyClientConfig;
+import org.apache.rocketmq.remoting.netty.NettyServerConfig;
+import org.apache.rocketmq.remoting.protocol.LanguageCode;
+import org.apache.rocketmq.remoting.protocol.RemotingCommand;
+import org.apache.rocketmq.store.config.MessageStoreConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ConsumerManageProcessorTest {
+ private ConsumerManageProcessor consumerManageProcessor;
+ @Spy
+ private BrokerController brokerController = new BrokerController(new
BrokerConfig(), new NettyServerConfig(), new NettyClientConfig(), new
MessageStoreConfig());
+ @Mock
+ private ChannelHandlerContext handlerContext;
+
+ private String group = "FooBarGroup";
+ private String topic = "FooBar";
+
+ @Before
+ public void init() {
+ consumerManageProcessor = new
ConsumerManageProcessor(brokerController);
+ }
+
+ @Test
+ public void processRequest_QueryOffsetWithExistingSubscription() throws
Exception {
+ long commitOffset = 1;
+ brokerController.getConsumerOffsetManager().commitOffset(null, group,
topic, 0, commitOffset);
+
+ RemotingCommand request = createQueryConsumerOffsetCommand(0);
+ RemotingCommand response =
consumerManageProcessor.processRequest(handlerContext, request);
+ QueryConsumerOffsetResponseHeader responseHeader =
(QueryConsumerOffsetResponseHeader) response.readCustomHeader();
+
+ assertThat(response).isNotNull();
+ assertThat(response.getCode()).isEqualTo(ResponseCode.SUCCESS);
+ assertThat(responseHeader.getOffset()).isEqualTo(commitOffset);
+ }
+
+ @Test
+ public void processRequest_QueryOffsetWithNewSubscription() throws
Exception {
+ brokerController.getConsumerOffsetManager().getOffsetTable().clear();
+
+ RemotingCommand request = createQueryConsumerOffsetCommand(0);
+ RemotingCommand response =
consumerManageProcessor.processRequest(handlerContext, request);
+
+ assertThat(response).isNotNull();
+ assertThat(response.getCode()).isEqualTo(ResponseCode.QUERY_NOT_FOUND);
+ assertThat(response.getRemark()).contains("The subscription is
probably new.");
+ }
+
+ @Test
+ public void processRequest_QueryOffsetWithNewScaledQueue() throws
Exception {
+ int commitQueueId = 0;
+ brokerController.getConsumerOffsetManager().commitOffset("", group,
topic, commitQueueId, 0);
+
+ RemotingCommand request =
createQueryConsumerOffsetCommand(commitQueueId + 1);
+ RemotingCommand response =
consumerManageProcessor.processRequest(handlerContext, request);
+ QueryConsumerOffsetResponseHeader responseHeader =
(QueryConsumerOffsetResponseHeader) response.readCustomHeader();
+
+ assertThat(response).isNotNull();
+ assertThat(response.getCode()).isEqualTo(ResponseCode.SUCCESS);
+ assertThat(responseHeader.getOffset()).isEqualTo(0);
+ }
+
+ private RemotingCommand createQueryConsumerOffsetCommand(int queueId) {
+ QueryConsumerOffsetRequestHeader requestHeader = new
QueryConsumerOffsetRequestHeader();
+ requestHeader.setTopic(topic);
+ requestHeader.setQueueId(queueId);
+ requestHeader.setConsumerGroup(group);
+
+ RemotingCommand request =
RemotingCommand.createRequestCommand(RequestCode.QUERY_CONSUMER_OFFSET,
requestHeader);
+ request.setLanguage(LanguageCode.JAVA);
+ request.setVersion(100);
+ request.makeCustomHeaderToNet();
+ return request;
+ }
+}
diff --git
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalancePushImpl.java
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalancePushImpl.java
index 112bceeb8..75eaaf211 100644
---
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalancePushImpl.java
+++
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalancePushImpl.java
@@ -121,72 +121,49 @@ public long computePullFromWhere(MessageQueue mq) {
long result = -1;
final ConsumeFromWhere consumeFromWhere =
this.defaultMQPushConsumerImpl.getDefaultMQPushConsumer().getConsumeFromWhere();
final OffsetStore offsetStore =
this.defaultMQPushConsumerImpl.getOffsetStore();
- switch (consumeFromWhere) {
- case CONSUME_FROM_LAST_OFFSET_AND_FROM_MIN_WHEN_BOOT_FIRST:
- case CONSUME_FROM_MIN_OFFSET:
- case CONSUME_FROM_MAX_OFFSET:
- case CONSUME_FROM_LAST_OFFSET: {
- long lastOffset = offsetStore.readOffset(mq,
ReadOffsetType.READ_FROM_STORE);
- if (lastOffset >= 0) {
- result = lastOffset;
- }
- // First start,no offset
- else if (-1 == lastOffset) {
- if
(mq.getTopic().startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)) {
- result = 0L;
- } else {
- try {
- result =
this.mQClientFactory.getMQAdminImpl().maxOffset(mq);
- } catch (MQClientException e) {
- result = -1;
- }
+ long lastOffset = offsetStore.readOffset(mq,
ReadOffsetType.READ_FROM_STORE);
+ // Offset found, continue pulling from here
+ if (lastOffset >= 0) {
+ result = lastOffset;
+ }
+ // If not found, with RETRY_GROUP_TOPIC_PREFIX, continue from 0
+ else if (mq.getTopic().startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)) {
+ result = 0L;
+ }
+ // else, determine where to pull from
+ else {
+ switch (consumeFromWhere) {
+ case CONSUME_FROM_LAST_OFFSET_AND_FROM_MIN_WHEN_BOOT_FIRST:
+ case CONSUME_FROM_MIN_OFFSET:
+ case CONSUME_FROM_MAX_OFFSET:
+ case CONSUME_FROM_LAST_OFFSET:
+ try {
+ result =
this.mQClientFactory.getMQAdminImpl().maxOffset(mq);
+ } catch (MQClientException e) {
+ result = -1;
}
- } else {
- result = -1;
- }
- break;
- }
- case CONSUME_FROM_FIRST_OFFSET: {
- long lastOffset = offsetStore.readOffset(mq,
ReadOffsetType.READ_FROM_STORE);
- if (lastOffset >= 0) {
- result = lastOffset;
- } else if (-1 == lastOffset) {
- result = 0L;
- } else {
- result = -1;
- }
- break;
- }
- case CONSUME_FROM_TIMESTAMP: {
- long lastOffset = offsetStore.readOffset(mq,
ReadOffsetType.READ_FROM_STORE);
- if (lastOffset >= 0) {
- result = lastOffset;
- } else if (-1 == lastOffset) {
- if
(mq.getTopic().startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)) {
- try {
- result =
this.mQClientFactory.getMQAdminImpl().maxOffset(mq);
- } catch (MQClientException e) {
- result = -1;
- }
- } else {
- try {
- long timestamp =
UtilAll.parseDate(this.defaultMQPushConsumerImpl.getDefaultMQPushConsumer().getConsumeTimestamp(),
- UtilAll.YYYYMMDDHHMMSS).getTime();
- result =
this.mQClientFactory.getMQAdminImpl().searchOffset(mq, timestamp);
- } catch (MQClientException e) {
- result = -1;
- }
+ break;
+ case CONSUME_FROM_FIRST_OFFSET:
+ try {
+ result =
this.mQClientFactory.getMQAdminImpl().minOffset(mq);
+ } catch (MQClientException e) {
+ result = -1;
}
- } else {
- result = -1;
- }
- break;
+ break;
+ case CONSUME_FROM_TIMESTAMP:
+ try {
+ long timestamp = UtilAll.parseDate(
+
this.defaultMQPushConsumerImpl.getDefaultMQPushConsumer().getConsumeTimestamp(),
+ UtilAll.YYYYMMDDHHMMSS).getTime();
+ result =
this.mQClientFactory.getMQAdminImpl().searchOffset(mq, timestamp);
+ } catch (MQClientException e) {
+ result = -1;
+ }
+ break;
+ default:
+ break;
}
-
- default:
- break;
}
-
return result;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
