[fix][test] Fix test testThreadSwitchOfZkMetadataStore

apache · Jul 7, 2023 · e6d4f09 · e6d4f09 · dave2wave · Jul 8, 2023
1 parent 1dbc723
commit e6d4f09
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
@@ -396,33 +396,29 @@ public void testDeleteUnusedDirectories(String provider, Supplier<String> urlSup
     @DataProvider(name = "conditionOfSwitchThread")
     public Object[][] conditionOfSwitchThread(){
         return new Object[][]{
-            {false, false},
-            {false, true},
-            {true, false},
-            {true, true}
+            {false},
+            {true},
+            {false},
+            {true}
         };
     }
 
     @Test(dataProvider = "conditionOfSwitchThread")
-    public void testThreadSwitchOfZkMetadataStore(boolean hasSynchronizer, boolean enabledBatch) throws Exception {
+    public void testThreadSwitchOfZkMetadataStore(boolean enabledBatch) throws Exception {
         final String prefix = newKey();
-        final String metadataStoreName = UUID.randomUUID().toString().replaceAll("-", "");
+        final String metadataStoreNamePrefix = "metadata-store";
         MetadataStoreConfig.MetadataStoreConfigBuilder builder =
-                MetadataStoreConfig.builder().metadataStoreName(metadataStoreName);
-        builder.fsyncEnable(false);
+                MetadataStoreConfig.builder();
         builder.batchingEnabled(enabledBatch);
-        if (!hasSynchronizer) {
-            builder.synchronizer(null);
-        }
         MetadataStoreConfig config = builder.build();
         @Cleanup
         ZKMetadataStore store = (ZKMetadataStore) MetadataStoreFactory.create(zks.getConnectionString(), config);
 
         final Runnable verify = () -> {
             String currentThreadName = Thread.currentThread().getName();
             String errorMessage = String.format("Expect to switch to thread %s, but currently it is thread %s",
-                    metadataStoreName, currentThreadName);
-            assertTrue(Thread.currentThread().getName().startsWith(metadataStoreName), errorMessage);
+                    metadataStoreNamePrefix, currentThreadName);
+            assertTrue(Thread.currentThread().getName().startsWith(metadataStoreNamePrefix), errorMessage);
         };
 
         // put with node which has parent(but the parent node is not exists).