vongosling closed pull request #244: [ISSUE #242] New consumer may consume all
message
URL: https://github.com/apache/rocketmq/pull/244
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 028d21bf9..43cd8eebc 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
@@ -134,19 +134,8 @@ private RemotingCommand
queryConsumerOffset(ChannelHandlerContext ctx, RemotingC
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)) {
- 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");
- }
+ response.setCode(ResponseCode.QUERY_NOT_FOUND);
+ response.setRemark("Not found, V3_0_6_SNAPSHOT maybe this group
consumer boot first");
}
return response;
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..896d8911e
--- /dev/null
+++
b/broker/src/test/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessorTest.java
@@ -0,0 +1,101 @@
+/*
+ * 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.ChannelHandlerContext;
+import java.lang.reflect.Method;
+import org.apache.rocketmq.broker.BrokerController;
+import org.apache.rocketmq.broker.offset.ConsumerOffsetManager;
+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.remoting.protocol.RemotingCommand;
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class ConsumerManageProcessorTest {
+
+ private BrokerController brokerController;
+ private ConsumerOffsetManager consumerOffsetManager;
+ private String normaCid = "normalCid";
+ private String exceptionCid = "exceptionCid";
+
+ @Test
+ public void test_queryConsumerOffset_normal() throws Exception {
+
+
when(brokerController.getConsumerOffsetManager()).thenReturn(consumerOffsetManager);
+ when(consumerOffsetManager.queryOffset(eq(normaCid), anyString(),
anyInt())).thenReturn(10L);
+
+ ConsumerManageProcessor consumerManageProcessor = new
ConsumerManageProcessor(brokerController);
+
+ RemotingCommand request = buildQueryCommond(normaCid);
+
+ Method method =
ConsumerManageProcessor.class.getDeclaredMethod("queryConsumerOffset",
ChannelHandlerContext.class, RemotingCommand.class);
+ method.setAccessible(true);
+
+ final Object invoke = method.invoke(consumerManageProcessor, null,
request);
+
+ RemotingCommand response = (RemotingCommand) invoke;
+
+ assertEquals(ResponseCode.SUCCESS, response.getCode());
+
+ }
+
+ @Test
+ public void test_queryConsumerOffset_not_exists() throws Exception {
+
+
when(brokerController.getConsumerOffsetManager()).thenReturn(consumerOffsetManager);
+ when(consumerOffsetManager.queryOffset(eq(exceptionCid), anyString(),
anyInt())).thenReturn(-1L);
+
+ ConsumerManageProcessor consumerManageProcessor = new
ConsumerManageProcessor(brokerController);
+
+ RemotingCommand request = buildQueryCommond(exceptionCid);
+
+ Method method =
ConsumerManageProcessor.class.getDeclaredMethod("queryConsumerOffset",
ChannelHandlerContext.class, RemotingCommand.class);
+ method.setAccessible(true);
+
+ final Object invoke = method.invoke(consumerManageProcessor, null,
request);
+
+ RemotingCommand response = (RemotingCommand) invoke;
+
+ assertEquals(ResponseCode.QUERY_NOT_FOUND, response.getCode());
+
+ }
+
+ @Before
+ public void initMock() throws Exception {
+ brokerController = mock(BrokerController.class);
+ consumerOffsetManager = mock(ConsumerOffsetManager.class);
+ }
+
+ private RemotingCommand buildQueryCommond(String cid) {
+ QueryConsumerOffsetRequestHeader requestHeader = new
QueryConsumerOffsetRequestHeader();
+ requestHeader.setConsumerGroup(cid);
+ requestHeader.setTopic("topic");
+ requestHeader.setQueueId(0);
+ RemotingCommand requestCommand =
RemotingCommand.createRequestCommand(RequestCode.GET_CONSUMER_LIST_BY_GROUP,
requestHeader);
+ requestCommand.makeCustomHeaderToNet();
+ return requestCommand;
+ }
+}
----------------------------------------------------------------
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
