Skip to content

[ISSUE #10082] Missing PROPERTY_TIMER_DELAY_MS property check in delay message type validation #10084

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

Merged
lizhimins merged 1 commit into from
Feb 10, 2026
Merged

[ISSUE #10082] Missing PROPERTY_TIMER_DELAY_MS property check in delay message type validation #10084

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
38 changes: 23 additions & 15 deletions proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.common.attribute.TopicMessageType;
import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.common.filter.ExpressionType;
import org.apache.rocketmq.common.message.MessageConst;
Expand Down Expand Up @@ -160,21 +161,8 @@ protected SystemProperties buildSystemProperties(MessageExt messageExt) {
}

// message_type
String isTrans = messageExt.getProperty(MessageConst.PROPERTY_TRANSACTION_PREPARED);
String isTransValue = "true";
if (isTransValue.equals(isTrans)) {
systemPropertiesBuilder.setMessageType(MessageType.TRANSACTION);
} else if (messageExt.getProperty(MessageConst.PROPERTY_DELAY_TIME_LEVEL) != null
|| messageExt.getProperty(MessageConst.PROPERTY_TIMER_DELIVER_MS) != null
|| messageExt.getProperty(MessageConst.PROPERTY_TIMER_DELAY_SEC) != null) {
systemPropertiesBuilder.setMessageType(MessageType.DELAY);
} else if (messageExt.getProperty(MessageConst.PROPERTY_SHARDING_KEY) != null) {
systemPropertiesBuilder.setMessageType(MessageType.FIFO);
} else if (messageExt.getProperty(MessageConst.PROPERTY_LITE_TOPIC) != null) {
systemPropertiesBuilder.setMessageType(MessageType.LITE);
} else {
systemPropertiesBuilder.setMessageType(MessageType.NORMAL);
}
TopicMessageType topicMessageType = TopicMessageType.parseFromMessageProperty(messageExt.getProperties());
systemPropertiesBuilder.setMessageType(convertToGrpcMessageType(topicMessageType));

// born_timestamp (millis)
long bornTimestamp = messageExt.getBornTimestamp();
Expand Down Expand Up @@ -271,4 +259,24 @@ public Resource buildResource(String resourceNameWithNamespace) {
.setName(NamespaceUtil.withoutNamespace(resourceNameWithNamespace))
.build();
}

protected MessageType convertToGrpcMessageType(TopicMessageType topicMessageType) {
switch (topicMessageType) {
case TRANSACTION:
return MessageType.TRANSACTION;
case DELAY:
return MessageType.DELAY;
case FIFO:
return MessageType.FIFO;
case PRIORITY:
return MessageType.PRIORITY;
case LITE:
return MessageType.LITE;
case NORMAL:
return MessageType.NORMAL;
case UNSPECIFIED:
default:
return MessageType.NORMAL;
}
}
}
Loading