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

apache · Sep 6, 2023 · 1300eb5 · 1300eb5
1 parent fd86ada
commit 1300eb5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 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
@@ -55,7 +55,8 @@ public void cleanup() throws Exception {
     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
@@ -570,7 +570,7 @@ public void testBatchMessageWithNullValue() throws Exception {
 
         // 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
@@ -35,7 +35,6 @@
 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;