Skip to content

[BUG] Cold-data flow control NPEs for pull requests whose group is only in the compensation table #11095

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

[BUG] Cold-data flow control NPEs for pull requests whose group is only in the compensation table #11095

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
9 changes: 8 additions & 1 deletion broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,14 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re
.getColdDataCheckService().isMsgInColdArea(requestHeader.getConsumerGroup(),
requestHeader.getTopic(), requestHeader.getQueueId(), requestHeader.getQueueOffset());
if (isMsgLogicCold) {
ConsumeType consumeType = this.brokerController.getConsumerManager().getConsumerGroupInfo(requestHeader.getConsumerGroup()).getConsumeType();
// The group may only be known through the compensation table filled a
// few lines above (pull consumers and proxy traffic), so look there
// too; if even that has no record, flow control like a passive
// consumer instead of failing the request with an NPE.
ConsumerGroupInfo consumerGroupInfo = this.brokerController.getConsumerManager()
.getConsumerGroupInfo(requestHeader.getConsumerGroup(), true);
ConsumeType consumeType = consumerGroupInfo == null
? ConsumeType.CONSUME_PASSIVELY : consumerGroupInfo.getConsumeType();
if (consumeType == ConsumeType.CONSUME_PASSIVELY) {
response.setCode(ResponseCode.SYSTEM_BUSY);
response.setRemark("This consumer group is reading cold data. It has been flow control");
Expand Down
40 changes: 40 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/processor/PullMessageProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.rocketmq.common.BrokerConfig;
import org.apache.rocketmq.common.TopicConfig;
import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
import org.apache.rocketmq.common.sysflag.PullSysFlag;
import org.apache.rocketmq.remoting.exception.RemotingCommandException;
import org.apache.rocketmq.remoting.netty.NettyClientConfig;
import org.apache.rocketmq.remoting.netty.NettyServerConfig;
Expand All @@ -49,6 +50,8 @@
import org.apache.rocketmq.store.GetMessageResult;
import org.apache.rocketmq.store.GetMessageStatus;
import org.apache.rocketmq.store.MessageStore;
import org.apache.rocketmq.store.CommitLog;
import org.apache.rocketmq.store.DefaultMessageStore;
import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.junit.Assert;
import org.junit.Before;
Expand All @@ -63,6 +66,7 @@
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

@RunWith(MockitoJUnitRunner.class)
Expand Down Expand Up @@ -247,6 +251,42 @@ public void testCommitPullOffset() throws RemotingCommandException {
.isEqualTo(getMessageResult.getNextBeginOffset());
}

@Test
public void testColdDataFlowCtrWhenGroupIsOnlyInCompensationTable() throws Exception {
brokerController.getMessageStoreConfig().setColdDataFlowControlEnable(true);
brokerController.getColdDataCgCtrService().coldAcc(group, Long.MAX_VALUE);
brokerController.getConsumerManager().unregisterConsumer(group, clientChannelInfo, false);

DefaultMessageStore defaultMessageStore = mock(DefaultMessageStore.class);
CommitLog commitLog = mock(CommitLog.class);
CommitLog.ColdDataCheckService coldDataCheckService = mock(CommitLog.ColdDataCheckService.class);
when(defaultMessageStore.getCommitLog()).thenReturn(commitLog);
when(commitLog.getColdDataCheckService()).thenReturn(coldDataCheckService);
when(coldDataCheckService.isMsgInColdArea(anyString(), anyString(), anyInt(), anyLong())).thenReturn(true);
brokerController.setMessageStore(defaultMessageStore);

// Pull with the subscription carried in the request (proxy / lite-pull style):
// the group is absent from the live consumer table, only compensated above.
PullMessageRequestHeader requestHeader = new PullMessageRequestHeader();
requestHeader.setCommitOffset(123L);
requestHeader.setConsumerGroup(group);
requestHeader.setMaxMsgNums(100);
requestHeader.setQueueId(1);
requestHeader.setQueueOffset(456L);
requestHeader.setSubscription("*");
requestHeader.setTopic(topic);
requestHeader.setSysFlag(PullSysFlag.buildSysFlag(false, false, true, false));
requestHeader.setSubVersion(100L);
RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.PULL_MESSAGE, requestHeader);
request.makeCustomHeaderToNet();

RemotingCommand response = pullMessageProcessor.processRequest(handlerContext, request);

assertThat(response).isNotNull();
assertThat(response.getCode()).isEqualTo(ResponseCode.SYSTEM_BUSY);
assertThat(response.getRemark()).contains("cold data");
}

private RemotingCommand createPullMsgCommand(int requestCode) {
PullMessageRequestHeader requestHeader = new PullMessageRequestHeader();
requestHeader.setCommitOffset(123L);
Expand Down