Denovo1998 commented on code in PR #25010:
URL: https://github.com/apache/pulsar/pull/25010#discussion_r2656032745
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java:
##########
@@ -4833,13 +4792,22 @@ public Optional<TopicName> getShadowSourceTopic() {
protected boolean isExceedMaximumDeliveryDelay(ByteBuf headersAndPayload) {
if (isDelayedDeliveryEnabled()) {
long maxDeliveryDelayInMs = getDelayedDeliveryMaxDelayInMillis();
- if (maxDeliveryDelayInMs > 0) {
- headersAndPayload.markReaderIndex();
- MessageMetadata msgMetadata =
Commands.parseMessageMetadata(headersAndPayload);
- headersAndPayload.resetReaderIndex();
- return msgMetadata.hasDeliverAtTime()
- && msgMetadata.getDeliverAtTime() -
msgMetadata.getPublishTime() > maxDeliveryDelayInMs;
+ Integer messageTTLInSeconds =
topicPolicies.getMessageTTLInSeconds().get();
+ if (maxDeliveryDelayInMs <= 0 && (messageTTLInSeconds == null ||
messageTTLInSeconds <= 0)) {
+ return false;
+ }
+ headersAndPayload.markReaderIndex();
+ MessageMetadata msgMetadata =
Commands.parseMessageMetadata(headersAndPayload);
+ headersAndPayload.resetReaderIndex();
+ if (!msgMetadata.hasDeliverAtTime()) {
+ return false;
}
+ long deliverAtTime = msgMetadata.getDeliverAtTime();
+ // count exceed ttl delayed messages
+ if (deliverAtTime >= (messageTTLInSeconds * 1000L) +
System.currentTimeMillis()) {
+ this.incrementExceedTTLDelayedMessages();
+ }
Review Comment:
There is no guarantee that messageTTLInSeconds > 0.
I suggest wrapping the counting logic in
```java
if (messageTTLInSeconds != null && messageTTLInSeconds > 0)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
