Skip to content

fix(broker): stop overwriting batch ack uniq key with single ack key in appendAck #11142

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
Open

fix(broker): stop overwriting batch ack uniq key with single ack key in appendAck #11142

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
1 change: 0 additions & 1 deletion broker/src/main/java/org/apache/rocketmq/broker/processor/AckMessageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,6 @@ private void appendAck(final AckMessageRequestHeader requestHeader, final BatchA
msgInner.setBornHost(this.brokerController.getStoreHost());
msgInner.setStoreHost(this.brokerController.getStoreHost());
msgInner.setDeliverTimeMs(popTime + invisibleTime);
msgInner.getProperties().put(MessageConst.PROPERTY_UNIQ_CLIENT_MESSAGE_ID_KEYIDX, PopMessageProcessor.genAckUniqueId(ackMsg));
msgInner.setPropertiesString(MessageDecoder.messageProperties2String(msgInner.getProperties()));
if (brokerController.getBrokerConfig().isAppendAckAsync()) {
int finalAckCount = ackCount;
Expand Down
49 changes: 49 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/processor/AckMessageProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@
import org.apache.rocketmq.store.PutMessageStatus;
import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.apache.rocketmq.store.exception.ConsumeQueueException;
import org.apache.rocketmq.store.pop.BatchAckMsg;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
Expand Down Expand Up @@ -366,4 +368,51 @@ public void testBatchAck_appendAck() throws RemotingCommandException {
}
}

@Test
public void testBatchAck_appendAck_BatchUniqKeyKept() throws RemotingCommandException {
PopBufferMergeService popBufferMergeService = mock(PopBufferMergeService.class);
when(popBufferMergeService.addAk(anyInt(), any())).thenReturn(false);
when(popMessageProcessor.getPopBufferMergeService()).thenReturn(popBufferMergeService);
PutMessageResult putMessageResult = new PutMessageResult(PutMessageStatus.PUT_OK, null);
ArgumentCaptor<MessageExtBrokerInner> msgCaptor = ArgumentCaptor.forClass(MessageExtBrokerInner.class);
when(messageStore.putMessage(msgCaptor.capture())).thenReturn(putMessageResult);

long popTime = 1666860736757L;
String brokerName = "broker-a";
BatchAck bAck1 = new BatchAck();
bAck1.setConsumerGroup(MixAll.DEFAULT_CONSUMER_GROUP);
bAck1.setTopic(topic);
bAck1.setQueueId(0);
bAck1.setReviveQueueId(0);
bAck1.setStartOffset(MIN_OFFSET_IN_QUEUE);
bAck1.setBitSet(new BitSet());
bAck1.getBitSet().set(1);
bAck1.setRetry("0");
bAck1.setPopTime(popTime);
bAck1.setInvisibleTime(60000L);

RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.BATCH_ACK_MESSAGE, null);
BatchAckMessageRequestBody reqBody = new BatchAckMessageRequestBody();
reqBody.setAcks(Collections.singletonList(bAck1));
reqBody.setBrokerName(brokerName);
request.setBody(reqBody.encode());
request.makeCustomHeaderToNet();
RemotingCommand response = ackMessageProcessor.processRequest(handlerContext, request);

assertThat(response.getCode()).isEqualTo(ResponseCode.SUCCESS);
MessageExtBrokerInner ackMessage = msgCaptor.getValue();
assertThat(ackMessage).isNotNull();

BatchAckMsg expected = new BatchAckMsg();
expected.setConsumerGroup(MixAll.DEFAULT_CONSUMER_GROUP);
expected.setTopic(topic);
expected.setQueueId(0);
expected.setStartOffset(MIN_OFFSET_IN_QUEUE);
expected.setPopTime(popTime);
expected.setBrokerName(brokerName);
expected.getAckOffsetList().add(MIN_OFFSET_IN_QUEUE + 1);

assertThat(ackMessage.getProperties().get(MessageConst.PROPERTY_UNIQ_CLIENT_MESSAGE_ID_KEYIDX))
.isEqualTo(PopMessageProcessor.genBatchAckUniqueId(expected));
}
}