jiazhai closed pull request #2575: Issue #2574: Timeout message not get
redeliver in TopicsConsumer when use message listener
URL: https://github.com/apache/incubator-pulsar/pull/2575
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java
index d28d1d5f33..b655842961 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java
@@ -19,6 +19,7 @@
package org.apache.pulsar.client.impl;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
@@ -615,4 +616,61 @@ public void testTopicsNameSubscribeWithBuilderFail()
throws Exception {
}
}
+ /**
+ * Test Listener
+ */
+ @Test(timeOut = 30000)
+ public void testMultiTopicsMessageListener() throws Exception {
+ String key = "MultiTopicsMessageListenerTest";
+ final String subscriptionName = "my-ex-subscription-" + key;
+ final String messagePredicate = "my-message-" + key + "-";
+ final int totalMessages = 6;
+
+ // set latch larger than totalMessages, so timeout message get resend
+ CountDownLatch latch = new CountDownLatch(totalMessages * 3);
+
+ final String topicName1 = "persistent://prop/use/ns-abc/topic-1-" +
key;
+ List<String> topicNames = Lists.newArrayList(topicName1);
+
+ admin.tenants().createTenant("prop", new TenantInfo());
+ admin.topics().createPartitionedTopic(topicName1, 2);
+
+ // 1. producer connect
+ Producer<byte[]> producer1 =
pulsarClient.newProducer().topic(topicName1)
+ .enableBatching(false)
+ .messageRoutingMode(MessageRoutingMode.SinglePartition)
+ .create();
+
+ // 2. Create consumer, set not ack in message listener, so time-out
message will resend
+ Consumer<byte[]> consumer = pulsarClient.newConsumer()
+ .topics(topicNames)
+ .subscriptionName(subscriptionName)
+ .subscriptionType(SubscriptionType.Shared)
+ .ackTimeout(1000, TimeUnit.MILLISECONDS)
+ .receiverQueueSize(4)
+ .messageListener((c1, msg) -> {
+ assertNotNull(msg, "Message cannot be null");
+ String receivedMessage = new String(msg.getData());
+ latch.countDown();
+
+ log.info("Received message [{}] in the listener, latch: {}",
+ receivedMessage, latch.getCount());
+ // since not acked, it should retry another time
+ //c1.acknowledgeAsync(msg);
+ })
+ .subscribe();
+ assertTrue(consumer instanceof MultiTopicsConsumerImpl);
+
+ MultiTopicsConsumerImpl topicsConsumer = (MultiTopicsConsumerImpl)
consumer;
+
+ // 3. producer publish messages
+ for (int i = 0; i < totalMessages; i++) {
+ producer1.send((messagePredicate + "producer1-" + i).getBytes());
+ }
+
+ // verify should not time out.
+ latch.await();
+
+ consumer.close();
+ }
}
diff --git
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
index a0a231902f..ced7fc2aed 100644
---
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
+++
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
@@ -981,12 +981,7 @@ protected synchronized void messageProcessed(Message<?>
msg) {
if (id instanceof BatchMessageIdImpl) {
id = new MessageIdImpl(id.getLedgerId(), id.getEntryId(),
getPartitionIndex());
}
- if (partitionIndex != -1) {
- // we should no longer track this message, TopicsConsumer will
take care from now onwards
- unAckedMessageTracker.remove(id);
- } else {
- unAckedMessageTracker.add(id);
- }
+ unAckedMessageTracker.add(id);
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
