Skip to content

[ISSUE #9923] Transactional messages should not send custom delayed messages #9924

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
yx9o wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[ISSUE #9923] Transactional messages should not send custom delayed messages #9924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d0fd8d
[ISSUE #9923] Transactional messages should not send custom delayed m…
yx9o Dec 13, 2025
1cf8904
Transactional messages do not support delayed delivery
yx9o Dec 16, 2025
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
17 changes: 11 additions & 6 deletions client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,11 +1438,7 @@ public TransactionSendResult sendMessageInTransaction(final Message msg,
throw new MQClientException("tranExecutor is null", null);
}

// ignore DelayTimeLevel parameter
if (msg.getDelayTimeLevel() != 0) {
MessageAccessor.clearProperty(msg, MessageConst.PROPERTY_DELAY_TIME_LEVEL);
}

ensureNotDelayedForTransactional(msg);
Validators.checkMessage(msg, this.defaultMQProducer);

SendResult sendResult = null;
Expand Down Expand Up @@ -1499,7 +1495,7 @@ public TransactionSendResult sendMessageInTransaction(final Message msg,
try {
this.endTransaction(msg, sendResult, localTransactionState, localException);
} catch (Exception e) {
log.warn("local transaction execute " + localTransactionState + ", but end broker transaction failed", e);
log.warn("local transaction execute {}, but end broker transaction failed", localTransactionState, e);
}

TransactionSendResult transactionSendResult = new TransactionSendResult();
Expand All @@ -1512,6 +1508,15 @@ public TransactionSendResult sendMessageInTransaction(final Message msg,
return transactionSendResult;
}

private void ensureNotDelayedForTransactional(final Message msg) throws MQClientException {
if (msg.getProperty(MessageConst.PROPERTY_DELAY_TIME_LEVEL) != null
|| msg.getProperty(MessageConst.PROPERTY_TIMER_DELAY_MS) != null
|| msg.getProperty(MessageConst.PROPERTY_TIMER_DELAY_SEC) != null
|| msg.getProperty(MessageConst.PROPERTY_TIMER_DELIVER_MS) != null) {
throw new MQClientException("Transactional messages do not support delayed delivery", null);
}
}

/**
* DEFAULT SYNC -------------------------------------------------------
*/
Expand Down
12 changes: 12 additions & 0 deletions ...nt/src/test/java/org/apache/rocketmq/client/trace/TransactionMQProducerWithTraceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,18 @@ public Object answer(InvocationOnMock mock) throws Throwable {
assertThat(ctx.getMessage().getTopic()).isEqualTo(topic);
}

@Test(expected = MQClientException.class)
public void testSendMessageInTransaction_NoListener_ThrowsException() throws MQClientException {
producer.setTransactionListener(null);
producer.sendMessageInTransaction(message, null);
}

@Test(expected = MQClientException.class)
public void testSendMessageInTransaction_DelayMsg_ThrowsException() throws MQClientException {
message.setDelayTimeLevel(3);
producer.sendMessageInTransaction(message, null);
}

@After
public void terminate() {
producer.shutdown();
Expand Down
Loading