[pulsar] branch master updated: [fix] [test] Fix flaky test `MetadataStoreStatsTest.testBatchMetadataStoreMetrics` (#19793)

[zixuan]

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

zixuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 4e48cc30bfa [fix] [test] Fix flaky test 
`MetadataStoreStatsTest.testBatchMetadataStoreMetrics` (#19793)
4e48cc30bfa is described below

commit 4e48cc30bfa6bf4d01659aac34d510f8b1492a10
Author: lifepuzzlefun <wjl_is_...@163.com>
AuthorDate: Wed Mar 15 15:57:07 2023 +0800

    [fix] [test] Fix flaky test 
`MetadataStoreStatsTest.testBatchMetadataStoreMetrics` (#19793)
    
    Co-authored-by: wangjinlong <wangjinl...@zhihu.com>
---
 .../MultiBrokerMetadataConsistencyTest.java        | 33 +++++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java
index 9eeef94572e..c998a1ba57c 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java
@@ -19,6 +19,7 @@
 package org.apache.pulsar.broker.zookeeper;
 
 import static org.testng.Assert.assertTrue;
+import java.util.ArrayList;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pulsar.broker.MultiBrokerBaseTest;
@@ -43,6 +44,9 @@ public class MultiBrokerMetadataConsistencyTest extends 
MultiBrokerBaseTest {
 
     TestZKServer testZKServer;
 
+    private final List<MetadataStoreExtended> needCloseStore =
+            new ArrayList<>();
+
     @Override
     protected void doInitConf() throws Exception {
         super.doInitConf();
@@ -59,20 +63,41 @@ public class MultiBrokerMetadataConsistencyTest extends 
MultiBrokerBaseTest {
                 log.error("Error in stopping ZK server", e);
             }
         }
+
+        needCloseStore.forEach((storeExtended) -> {
+            try {
+                storeExtended.close();
+            } catch (Exception e) {
+                log.error("error when close storeExtended", e);
+            }
+        });
+
+        needCloseStore.clear();
     }
 
     @Override
     protected PulsarTestContext.Builder 
createPulsarTestContextBuilder(ServiceConfiguration conf) {
+        MetadataStoreExtended metadataStore = createMetadataStore(
+                MultiBrokerMetadataConsistencyTest.class.getName()
+                        + "metadata_store");
+
+        MetadataStoreExtended configurationStore = createMetadataStore(
+                MultiBrokerMetadataConsistencyTest.class.getName()
+                        + "configuration_store");
+
+        needCloseStore.add(metadataStore);
+        needCloseStore.add(configurationStore);
+
         return super.createPulsarTestContextBuilder(conf)
-                .localMetadataStore(createMetadataStore())
-                .configurationMetadataStore(createMetadataStore());
+                .localMetadataStore(metadataStore)
+                .configurationMetadataStore(configurationStore);
     }
 
     @NotNull
-    protected MetadataStoreExtended createMetadataStore()  {
+    protected MetadataStoreExtended createMetadataStore(String name) {
         try {
             return 
MetadataStoreExtended.create(testZKServer.getConnectionString(),
-                    MetadataStoreConfig.builder().build());
+                    
MetadataStoreConfig.builder().metadataStoreName(name).build());
         } catch (MetadataStoreException e) {
             throw new RuntimeException(e);
         }