Skip to content
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

Jump to bottom

Fix batch ack count is negtive issue. #14288

Merged
merged 1 commit into from Feb 15, 2022
Merged

Fix batch ack count is negtive issue. #14288

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
View file
Open in desktop
Expand Up @@ -542,7 +542,8 @@ private long getAckedCountForMsgIdNoAckSets(long batchSize, PositionImpl positio

private long getAckedCountForBatchIndexLevelEnabled(PositionImpl position, long batchSize, long[] ackSets) {
long ackedCount = 0;
if (isAcknowledgmentAtBatchIndexLevelEnabled && Subscription.isIndividualAckMode(subType)) {
if (isAcknowledgmentAtBatchIndexLevelEnabled && Subscription.isIndividualAckMode(subType)
&& pendingAcks.get(position.getLedgerId(), position.getEntryId()) != null) {
long[] cursorAckSet = getCursorAckSet(position);
if (cursorAckSet != null) {
BitSetRecyclable cursorBitSet = BitSetRecyclable.create().resetWords(cursorAckSet);
Expand All @@ -553,7 +554,7 @@ private long getAckedCountForBatchIndexLevelEnabled(PositionImpl position, long
int currentCardinality = cursorBitSet.cardinality();
ackedCount = lastCardinality - currentCardinality;
cursorBitSet.recycle();
} else if (pendingAcks.get(position.getLedgerId(), position.getEntryId()) != null) {
} else {
ackedCount = batchSize - BitSet.valueOf(ackSets).cardinality();
}
}
Expand All @@ -574,6 +575,7 @@ private long getUnAckedCountForBatchIndexLevelEnabled(PositionImpl position, lon
if (cursorAckSet != null) {
BitSetRecyclable cursorBitSet = BitSetRecyclable.create().resetWords(cursorAckSet);
unAckedCount = cursorBitSet.cardinality();
cursorBitSet.recycle();
}
}
return unAckedCount;
Expand Down
96 changes: 92 additions & 4 deletions ...r/src/test/java/org/apache/pulsar/broker/service/BatchMessageWithBatchIndexLevelTest.java
View file
Open in desktop
Expand Up @@ -19,24 +19,24 @@
package org.apache.pulsar.broker.service;

import com.google.common.collect.Lists;
import lombok.Cleanup;
import lombok.SneakyThrows;
import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.client.impl.ConsumerImpl;
import org.apache.pulsar.common.util.FutureUtil;
import org.awaitility.Awaitility;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import java.util.List;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;

import static org.testng.Assert.assertEquals;

@Test(groups = "broker")
Expand All @@ -56,7 +56,8 @@ public void testBatchMessageAck() {
final String topicName = "persistent://prop/ns-abc/batchMessageAck-" + UUID.randomUUID();
final String subscriptionName = "sub-batch-1";

ConsumerImpl<byte[]> consumer = (ConsumerImpl<byte[]>) pulsarClient
@Cleanup
Consumer<byte[]> consumer = pulsarClient
.newConsumer()
.topic(topicName)
.subscriptionName(subscriptionName)
Expand All @@ -66,6 +67,7 @@ public void testBatchMessageAck() {
.negativeAckRedeliveryDelay(100, TimeUnit.MILLISECONDS)
.subscribe();

@Cleanup
Producer<byte[]> producer = pulsarClient
.newProducer()
.topic(topicName)
Expand Down Expand Up @@ -107,4 +109,90 @@ public void testBatchMessageAck() {
assertEquals(dispatcher.getConsumers().get(0).getUnackedMessages(), 16);
});
}

@Test
public void testBatchMessageMultiNegtiveAck() throws Exception{
final String topicName = "persistent://prop/ns-abc/batchMessageMultiNegtiveAck-" + UUID.randomUUID();
final String subscriptionName = "sub-negtive-1";

@Cleanup
Consumer<String> consumer = pulsarClient.newConsumer(Schema.STRING)
.topic(topicName)
.subscriptionName(subscriptionName)
.subscriptionType(SubscriptionType.Shared)
.receiverQueueSize(10)
.enableBatchIndexAcknowledgment(true)
.negativeAckRedeliveryDelay(100, TimeUnit.MILLISECONDS)
.subscribe();

@Cleanup
Producer<String> producer = pulsarClient
.newProducer(Schema.STRING)
.topic(topicName)
.batchingMaxMessages(20)
.batchingMaxPublishDelay(1, TimeUnit.HOURS)
.enableBatching(true)
.create();

final int N = 20;
for (int i = 0; i < N; i++) {
String value = "test-" + i;
producer.sendAsync(value);
}
producer.flush();
for (int i = 0; i < N; i++) {
Message<String> msg = consumer.receive();
if (i % 2 == 0) {
consumer.acknowledgeAsync(msg);
} else {
consumer.negativeAcknowledge(msg);
}
}
Awaitility.await().untilAsserted(() -> {
long unackedMessages = admin.topics().getStats(topicName).getSubscriptions().get(subscriptionName)
.getUnackedMessages();
assertEquals(unackedMessages, 10);
});

// Test negtive ack with sleep
final String topicName2 = "persistent://prop/ns-abc/batchMessageMultiNegtiveAck2-" + UUID.randomUUID();
final String subscriptionName2 = "sub-negtive-2";
@Cleanup
Consumer<String> consumer2 = pulsarClient.newConsumer(Schema.STRING)
.topic(topicName2)
.subscriptionName(subscriptionName2)
.subscriptionType(SubscriptionType.Shared)
.receiverQueueSize(10)
.enableBatchIndexAcknowledgment(true)
.negativeAckRedeliveryDelay(100, TimeUnit.MILLISECONDS)
.subscribe();
@Cleanup
Producer<String> producer2 = pulsarClient
.newProducer(Schema.STRING)
.topic(topicName2)
.batchingMaxMessages(20)
.batchingMaxPublishDelay(1, TimeUnit.HOURS)
.enableBatching(true)
.create();

for (int i = 0; i < N; i++) {
String value = "test-" + i;
producer2.sendAsync(value);
}
producer2.flush();
for (int i = 0; i < N; i++) {
Message<String> msg = consumer2.receive();
if (i % 2 == 0) {
consumer.acknowledgeAsync(msg);
} else {
consumer.negativeAcknowledge(msg);
Thread.sleep(100);
}
}
Awaitility.await().untilAsserted(() -> {
long unackedMessages = admin.topics().getStats(topicName).getSubscriptions().get(subscriptionName)
.getUnackedMessages();
assertEquals(unackedMessages, 10);
});
}
}