Skip to content

[BUG] EndTransactionProcessor NPEs when the prepared message lacks the producer group property #11096

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
+19 −1
Open

[BUG] EndTransactionProcessor NPEs when the prepared message lacks the producer group property #11096

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
5 changes: 4 additions & 1 deletion broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,10 @@ private RemotingCommand checkPrepareMessage(MessageExt msgExt, EndTransactionReq
return response;
}
final String pgroupRead = msgExt.getProperty(MessageConst.PROPERTY_PRODUCER_GROUP);
if (!pgroupRead.equals(requestHeader.getProducerGroup())) {
// The prepared message may lack the producer group property (messages
// written by old clients or restored stores); compare null-safely and
// reject instead of failing the request with an NPE.
if (!Objects.equals(pgroupRead, requestHeader.getProducerGroup())) {
response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark("The producer group wrong");
return response;
Expand Down
15 changes: 15 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/processor/EndTransactionProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,21 @@ public void testProcessRequestAllowsMissingTopicForCompatibility() throws Remoti
assertThat(response.getCode()).isEqualTo(ResponseCode.SUCCESS);
}

@Test
public void testProcessRequestRejectsPreparedMessageWithoutProducerGroup() throws RemotingCommandException {
OperationResult prepareResult = createResponse(ResponseCode.SUCCESS);
MessageAccessor.clearProperty(prepareResult.getPrepareMessage(), MessageConst.PROPERTY_PRODUCER_GROUP);
when(transactionMsgService.commitMessage(any(EndTransactionRequestHeader.class))).thenReturn(prepareResult);

RemotingCommand request = createEndTransactionMsgCommand(MessageSysFlag.TRANSACTION_COMMIT_TYPE, false);
RemotingCommand response = endTransactionProcessor.processRequest(handlerContext, request);

assertThat(response.getCode()).isEqualTo(ResponseCode.SYSTEM_ERROR);
assertThat(response.getRemark()).contains("producer group wrong");
verify(messageStore, never()).putMessage(any(MessageExtBrokerInner.class));
verify(transactionMsgService, never()).deletePrepareMessage(any(MessageExt.class));
}

private MessageExt createDefaultMessageExt() {
MessageExt messageExt = new MessageExt();
messageExt.setMsgId("12345678");
Expand Down