Reduce flakiness of ReplicatorTest.testConfigChange (apache#10116)

sarvex · Apr 2, 2021 · e1e2e53 · e1e2e53
1 parent 21adedc
commit e1e2e53
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java
@@ -82,8 +82,7 @@ public class ReplicatorTestBase extends TestRetrySupport {
 
     ZookeeperServerTest globalZkS;
 
-    ExecutorService executor = new ThreadPoolExecutor(5, 20, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),
-            new DefaultThreadFactory("ReplicatorTestBase"));
+    ExecutorService executor;
 
     static final int TIME_TO_CHECK_BACKLOG_QUOTA = 5;
 
@@ -104,6 +103,9 @@ protected void setup() throws Exception {
         incrementSetupNumber();
 
         log.info("--- Starting ReplicatorTestBase::setup ---");
+        executor = new ThreadPoolExecutor(5, 20, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),
+                new DefaultThreadFactory("ReplicatorTestBase"));
+
         globalZkS = new ZookeeperServerTest(0);
         globalZkS.start();
 
@@ -266,7 +268,10 @@ private int inSec(int time, TimeUnit unit) {
     protected void cleanup() throws Exception {
         markCurrentSetupNumberCleaned();
         log.info("--- Shutting down ---");
-        executor.shutdown();
+        if (executor != null) {
+            executor.shutdown();
+            executor = null;
+        }
 
         admin1.close();
         admin2.close();