Skip to content

[ci] Fix unable to sent cumulative acknowledge for last messageId of a batch when enable batch index acknowledgment #32

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

Closed
coderzc wants to merge 1 commit into from
Closed

[ci] Fix unable to sent cumulative acknowledge for last messageId of a batch when enable batch index acknowledgment #32

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 53 additions & 11 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIndexAckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@
*/
package org.apache.pulsar.client.impl;

import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doReturn;
import static org.testng.Assert.assertEquals;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.client.api.DigestType;
Expand All @@ -32,24 +42,15 @@
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.common.policies.data.PersistentTopicInternalStats;
import org.apache.pulsar.common.policies.data.TopicStats;
import org.apache.pulsar.common.util.FutureUtil;
import org.awaitility.Awaitility;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;

import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doReturn;

@Slf4j
@Test(groups = "broker-impl")
public class BatchMessageIndexAckTest extends ProducerConsumerBase {
Expand Down Expand Up @@ -345,4 +346,45 @@ public void testDoNotRecycleAckSetMultipleTimes() throws Exception {
producer.close();
consumer.close();
}

@Test
public void testAcknowledgeCumulative() throws Exception {
final String topic = "persistent://my-property/my-ns/testAcknowledgeCumulative";
int messageNumber= 10;
@Cleanup
Consumer<String> consumer = pulsarClient.newConsumer(Schema.STRING)
.topic(topic)
.subscriptionName("sub")
.enableBatchIndexAcknowledgment(true)
.subscribe();

@Cleanup
Producer<String> producer = pulsarClient.newProducer(Schema.STRING)
.topic(topic)
.batchingMaxMessages(messageNumber)
.blockIfQueueFull(true)
.create();

for (int i = 0; i < 10; i++) {
producer.sendAsync("message-" + i);
}
producer.flush();

int count = 0;
while (true) {
Message<String> message = consumer.receive(5, TimeUnit.SECONDS);
if (message == null) {
break;
}
consumer.acknowledgeCumulative(message.getMessageId());
count++;
}

assertEquals(count, messageNumber);
Awaitility.await().untilAsserted(() -> {
TopicStats stats = admin.topics().getStats(topic, true, true);
assertEquals(stats.getSubscriptions().get("sub").getMsgBacklog(), 0);
assertEquals(stats.getSubscriptions().get("sub").getBacklogSize(), 0);
});
}
}
13 changes: 12 additions & 1 deletion ...src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,18 @@ protected LastCumulativeAck initialValue() {
private boolean flushRequired = false;

public synchronized void update(final MessageIdImpl messageId, final BitSetRecyclable bitSetRecyclable) {
if (messageId.compareTo(this.messageId) > 0) {
MessageIdImpl newMessageId = messageId;
MessageIdImpl lastMessageId = this.messageId;
if (newMessageId instanceof BatchMessageIdImpl && !(lastMessageId instanceof BatchMessageIdImpl)) {
lastMessageId =
new BatchMessageIdImpl(lastMessageId.ledgerId, lastMessageId.entryId, lastMessageId.partitionIndex,
Integer.MAX_VALUE);
} else if (!(newMessageId instanceof BatchMessageIdImpl) && (lastMessageId instanceof BatchMessageIdImpl)) {
newMessageId =
new BatchMessageIdImpl(newMessageId.ledgerId, newMessageId.entryId, newMessageId.partitionIndex,
Integer.MAX_VALUE);
}
if (newMessageId.compareTo(lastMessageId) > 0) {
if (this.bitSetRecyclable != null && this.bitSetRecyclable != bitSetRecyclable) {
this.bitSetRecyclable.recycle();
}
Expand Down