You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2020/04/10 14:10:11 UTC

[GitHub] [pulsar] jeffgrunewald commented on a change in pull request #6680: [Issue 5979][pulsar-websocket] Add cumulative acknowledgement to websocket consumer

jeffgrunewald commented on a change in pull request #6680: [Issue 5979][pulsar-websocket] Add cumulative acknowledgement to websocket consumer
URL: https://github.com/apache/pulsar/pull/6680#discussion_r406774303
 
 

 ##########
 File path: pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ConsumerHandler.java
 ##########
 @@ -240,12 +242,27 @@ public void onWebSocketText(String message) {
                 // We should have received an ack
                 MessageId msgId = MessageId.fromByteArrayWithTopic(Base64.getDecoder().decode(command.messageId),
                         topic.toString());
-                consumer.acknowledgeAsync(msgId).thenAccept(consumer -> numMsgsAcked.increment());
-                if (!this.pullMode) {
-                    int pending = pendingMessages.getAndDecrement();
-                    if (pending >= maxPendingMessages) {
-                        // Resume delivery
-                        receiveMessage();
+                if ("cumulative".equals(command.ackType)) {
+                    ConsumerStats cStats = consumer.getStats();
+                    long ackDiff = cStats.getTotalMsgsReceived() - cStats.getTotalAcksSent();
+                    consumer.acknowledgeCumulativeAsync(msgId).thenAccept(consumer -> numMsgsAcked.add(ackDiff));
+                    if (!this.pullMode) {
+                        int acked = (int) ackDiff;
+                        IntBinaryOperator decrementFunction = (x, y) -> x - y;
+                        int pending = pendingMessages.accumulateAndGet(acked, decrementFunction);
 
 Review comment:
   That's reasonable and easy to correct; thanks for the insight!

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services