[ 
https://issues.apache.org/jira/browse/ARTEMIS-2664?focusedWorklogId=406529&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-406529
 ]

ASF GitHub Bot logged work on ARTEMIS-2664:
-------------------------------------------

                Author: ASF GitHub Bot
            Created on: 19/Mar/20 19:27
            Start Date: 19/Mar/20 19:27
    Worklog Time Spent: 10m 
      Work Description: franz1981 commented on pull request #3029: ARTEMIS-2664 
Fix the credits acquiring.
URL: https://github.com/apache/activemq-artemis/pull/3029#discussion_r395268455
 
 

 ##########
 File path: 
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
 ##########
 @@ -306,15 +306,12 @@ public void acknowledge(MessageAck ack) throws Exception 
{
       List<MessageReference> ackList = 
serverConsumer.getDeliveringReferencesBasedOnProtocol(removeReferences, first, 
last);
 
       if (removeReferences && (ack.isIndividualAck() || ack.isStandardAck() || 
ack.isPoisonAck())) {
-         this.deliveredAcks.getAndUpdate(deliveredAcks -> {
-            if (deliveredAcks >= ackList.size()) {
-               return deliveredAcks - ackList.size();
-            }
-
-            acquireCredit(ackList.size() - deliveredAcks);
+         int previousDeliveredAcks = this.deliveredAcks.getAndUpdate(
+            deliveredAcks -> deliveredAcks > ackList.size() ? deliveredAcks - 
ackList.size() : 0);
 
 Review comment:
   That's perfectly reasonable indeed, from any pov I agree :)
   In general I often see ownership and threading model not always clear in our 
code base so I would like to simplify things when we have the chance to do it 
to make easier the life of future contributors (including ourselves in the 
future). Probably thinking on some check/assert is a nice addition to make this 
more robust over time...
 
----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
[email protected]


Issue Time Tracking
-------------------

    Worklog Id:     (was: 406529)
    Time Spent: 4h 20m  (was: 4h 10m)

> The prefetch size is exceeded after delivered acks
> --------------------------------------------------
>
>                 Key: ARTEMIS-2664
>                 URL: https://issues.apache.org/jira/browse/ARTEMIS-2664
>             Project: ActiveMQ Artemis
>          Issue Type: Bug
>            Reporter: Domenico Bruscino
>            Priority: Major
>          Time Spent: 4h 20m
>  Remaining Estimate: 0h
>
> In an environment using OpenWire clients, after the consumer send delivered 
> acks, we see that messages get prefetched out to the consumer beyond its 
> limit.



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

Reply via email to