[pulsar] branch branch-2.10 updated: [branch-2.10] Fix flaky test (#21135)

[penghui]

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

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


The following commit(s) were added to refs/heads/branch-2.10 by this push:
     new 1300eb5a33a [branch-2.10] Fix flaky test (#21135)
1300eb5a33a is described below

commit 1300eb5a33a6c220aecc34bbdc28334fe7b2e4e5
Author: Qiang Zhao <mattisonc...@apache.org>
AuthorDate: Wed Sep 6 09:50:22 2023 +0800

    [branch-2.10] Fix flaky test (#21135)
---
 .../java/org/apache/pulsar/broker/service/BrokerServiceChaosTest.java  | 3 ++-
 .../src/test/java/org/apache/pulsar/compaction/CompactionTest.java     | 2 +-
 .../src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java      | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceChaosTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceChaosTest.java
index 614b4f08370..91e7941ca34 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceChaosTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceChaosTest.java
@@ -55,7 +55,8 @@ public class BrokerServiceChaosTest extends 
CanReconnectZKClientPulsarServiceBas
     public void testFetchPartitionedTopicMetadataWithCacheRefresh() throws 
Exception {
         final String configMetadataStoreConnectString =
                 
WhiteboxImpl.getInternalState(pulsar.getConfigurationMetadataStore(), 
"zkConnectString");
-        final ZooKeeper anotherZKCli = new 
ZooKeeper(configMetadataStoreConnectString, 5000, null);
+        final ZooKeeper anotherZKCli = new 
ZooKeeper(configMetadataStoreConnectString, 5000,
+                watchedEvent -> { });
         // Set policy of auto create topic to PARTITIONED.
         final String ns = defaultTenant + "/ns_" + 
UUID.randomUUID().toString().replaceAll("-", "");
         final TopicName topicName1 = TopicName.get("persistent://" + ns + 
"/tp1");
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java 
b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
index 0eec3e31cca..5e9a11fbfb0 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
@@ -570,7 +570,7 @@ public class CompactionTest extends 
MockedPulsarServiceBaseTest {
 
         // compact the topic
         Compactor compactor = new TwoPhaseCompactor(conf, pulsarClient, bk, 
compactionScheduler);
-        compactor.compact(topic);
+        compactor.compact(topic).join();
 
         // Read messages before compaction to get ids
         List<Message<byte[]>> messages = new ArrayList<>();
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 e8665152316..fd9d2d41af1 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
@@ -35,7 +35,6 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.BitSet;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;