Mitigate race condition in hz-cluster unit tests.

geoserver · Dec 13, 2018 · 2469eca · 2469eca
1 parent 8252045
commit 2469eca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/...munity/hz-cluster/src/main/java/org/geoserver/cluster/hazelcast/ReloadHzSynchronizer.java b/...munity/hz-cluster/src/main/java/org/geoserver/cluster/hazelcast/ReloadHzSynchronizer.java
@@ -10,7 +10,6 @@
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionException;
@@ -34,7 +33,7 @@ public class ReloadHzSynchronizer extends HzSynchronizer {
     /** lock during reload */
     protected AtomicBoolean eventLock = new AtomicBoolean();
 
-    final ExecutorService reloadService;
+    final ThreadPoolExecutor reloadService;
 
     public ReloadHzSynchronizer(HzCluster cluster, GeoServer gs) {
         super(cluster, gs);

diff --git a/...z-cluster/src/test/java/org/geoserver/cluster/hazelcast/ReloadHzSynchronizerRecvTest.java b/...z-cluster/src/test/java/org/geoserver/cluster/hazelcast/ReloadHzSynchronizerRecvTest.java
@@ -10,6 +10,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
 import org.geoserver.catalog.DataStoreInfo;
 import org.geoserver.catalog.FeatureTypeInfo;
 import org.geoserver.catalog.LayerInfo;
@@ -143,10 +144,16 @@ private void expectGeoServerReload() throws Exception {
     @Override
     protected void waitForSync() throws Exception {
         super.waitForSync();
-        // Add a small delay to reload calls to mitigate a race condition.
+        // Wait up to 5 seconds for the executor to be ready for the next reload.
-        try {
+        ThreadPoolExecutor executor = ((ReloadHzSynchronizer) sync).reloadService;
-            Thread.sleep(200);
+        for (int i = 0; i < 200; i++) {
-        } catch (InterruptedException e) {
+            if (executor.getActiveCount() == 0) {
+                return;
+            }
+            try {
+                Thread.sleep(25);
+            } catch (InterruptedException e) {
+            }
         }
     }
 }