[
https://issues.apache.org/jira/browse/AMQ-9829?focusedWorklogId=1001012&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-1001012
]
ASF GitHub Bot logged work on AMQ-9829:
---------------------------------------
Author: ASF GitHub Bot
Created on: 20/Jan/26 14:43
Start Date: 20/Jan/26 14:43
Worklog Time Spent: 10m
Work Description: cshannon commented on code in PR #1616:
URL: https://github.com/apache/activemq/pull/1616#discussion_r2708655637
##########
activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java:
##########
@@ -771,6 +778,9 @@ void clearMessagesInProgress() {
// ensure unconsumed are rolledback up front as they may
get redelivered to another consumer
List<MessageDispatch> list =
unconsumedMessages.removeAll();
if (!this.info.isBrowser()) {
+ if (session.isTransacted()) {
+
capturePrefetchedMessagesForDuplicateSuppression(list);
Review Comment:
This method iterates over the list and then right below we iterate again to
rollback duplicates. Im curious if we can somehow refactor to just iterate
once. Maybe something like:
```java
for (MessageDispatch old : list) {
if (session.isTransacted()) {
capturePrefetchedMessagesForDuplicateSuppression(old);
}
session.connection.rollbackDuplicate(this, old.getMessage());
}
```
```java
private void capturePrefetchedMessagesForDuplicateSuppression(final
MessageDispatch pending) {
if (previouslyDeliveredMessages == null) {
previouslyDeliveredMessages = new
PreviouslyDeliveredMap<>(session.getTransactionContext().getTransactionId());
}
if (pending.getMessage() != null) {
previouslyDeliveredMessages.put(pending.getMessage().getMessageId(),
new PreviouslyDelivered(pending, false, true));
}
LOG.trace("{} tracking existing transacted {} prefetched ({})",
getConsumerId(), previouslyDeliveredMessages.transactionId, pending);
}
```
Issue Time Tracking
-------------------
Worklog Id: (was: 1001012)
Time Spent: 1.5h (was: 1h 20m)
> Track prefetched messages for duplicate suppression during failover
> -------------------------------------------------------------------
>
> Key: AMQ-9829
> URL: https://issues.apache.org/jira/browse/AMQ-9829
> Project: ActiveMQ
> Issue Type: Bug
> Reporter: Jean-Louis Monteiro
> Priority: Major
> Time Spent: 1.5h
> Remaining Estimate: 0h
>
> Discovered with {{FailoverDurableSubTransactionTest}} flacky test
> During failover, messages were wrongly detected as being duplicated and sent
> to DLQ.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
