[pulsar] branch branch-2.9 updated: [fix][client] Fix multi-topic consumer stuck after redeliver messages (#18491)

[bogong]

This is an automated email from the ASF dual-hosted git repository.

bogong pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.9 by this push:
     new 97a4bbf06f4 [fix][client] Fix multi-topic consumer stuck after 
redeliver messages (#18491)
97a4bbf06f4 is described below

commit 97a4bbf06f4f46d1a751f079f0061586f41209f1
Author: fengyubiao <yubiao.f...@streamnative.io>
AuthorDate: Fri Nov 18 14:40:55 2022 +0800

    [fix][client] Fix multi-topic consumer stuck after redeliver messages 
(#18491)
    
    (cherry picked from commit 7a93ff92335ea9a73c73dafb925cad9583440039)
---
 .../java/org/apache/pulsar/broker/service/PersistentTopicTest.java    | 4 ++++
 .../src/test/java/org/apache/pulsar/client/impl/NegativeAcksTest.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
index ce207cb6beb..fdd32e2fd58 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
@@ -107,6 +107,8 @@ import 
org.apache.pulsar.broker.service.persistent.PersistentDispatcherSingleAct
 import org.apache.pulsar.broker.service.persistent.PersistentReplicator;
 import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
 import org.apache.pulsar.broker.service.persistent.PersistentTopic;
+import org.apache.pulsar.broker.service.schema.DefaultSchemaRegistryService;
+import org.apache.pulsar.broker.service.schema.SchemaRegistryService;
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.Schema;
@@ -184,6 +186,8 @@ public class PersistentTopicTest extends 
MockedBookKeeperTestCase {
         pulsar = spyWithClassAndConstructorArgs(PulsarService.class, 
svcConfig);
         doReturn(svcConfig).when(pulsar).getConfiguration();
         doReturn(mock(Compactor.class)).when(pulsar).getCompactor();
+        DefaultSchemaRegistryService schemaRegistryService = new 
DefaultSchemaRegistryService();
+        
doReturn(schemaRegistryService).when(pulsar).getSchemaRegistryService();
 
         mlFactoryMock = mock(ManagedLedgerFactory.class);
         doReturn(mlFactoryMock).when(pulsar).getManagedLedgerFactory();
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/NegativeAcksTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/NegativeAcksTest.java
index e13e07dfddf..23a3e9b1c7c 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/NegativeAcksTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/NegativeAcksTest.java
@@ -231,7 +231,7 @@ public class NegativeAcksTest extends ProducerConsumerBase {
             count++;
         }
         // because don't have the redeliver epoch, so receive the message 
count is bigger than 9
-        assertTrue(count > 9);
+        assertTrue(count > 8);
         Assert.assertEquals(0, datas.size());
     }