Stabilize singleton deployment integration tests.

clustering/server/src/main/java/org/wildfly/clustering/server/dispatcher/ChannelCommandDispatcherFactory.java

@@ -56,6 +56,8 @@
 import org.wildfly.clustering.marshalling.jboss.IndexExternalizer;
 import org.wildfly.clustering.marshalling.jboss.MarshallingContext;
 import org.wildfly.clustering.server.group.JGroupsNodeFactory;
+import org.wildfly.clustering.service.concurrent.ServiceExecutor;
+import org.wildfly.clustering.service.concurrent.StampedLockServiceExecutor;
 
 /**
  * {@link MessageDispatcher} based {@link CommandDispatcherFactory}.
@@ -68,6 +70,7 @@ public class ChannelCommandDispatcherFactory implements CommandDispatcherFactory
     final Map<Object, AtomicReference<Object>> contexts = new ConcurrentHashMap<>();
     final MarshallingContext marshallingContext;
 
+    private final ServiceExecutor executor = new StampedLockServiceExecutor();
     private final List<Listener> listeners = new CopyOnWriteArrayList<>();
     private final AtomicReference<View> view = new AtomicReference<>();
     private final MessageDispatcher dispatcher;
@@ -97,8 +100,10 @@ protected RequestCorrelator createRequestCorrelator(Protocol transport, RequestH
 
     @Override
     public void close() {
-        this.dispatcher.stop();
-        this.dispatcher.getChannel().setUpHandler(null);
+        this.executor.close(() -> {
+            this.dispatcher.stop();
+            this.dispatcher.getChannel().setUpHandler(null);
+        });
     }
 
     @Override
@@ -216,9 +221,11 @@ public void viewAccepted(View view) {
                 this.nodeFactory.invalidate(leftMembers);
             }
 
-            for (Listener listener: this.listeners) {
-                listener.membershipChanged(oldNodes, newNodes, view instanceof MergeView);
-            }
+            this.executor.execute(() -> {
+                for (Listener listener: this.listeners) {
+                    listener.membershipChanged(oldNodes, newNodes, view instanceof MergeView);
+                }
+            });
         }
     }
 

clustering/server/src/main/java/org/wildfly/clustering/server/logging/ClusteringServerLogger.java

@@ -54,11 +54,11 @@ public interface ClusteringServerLogger {
 
     @LogMessage(level = INFO)
     @Message(id = 1, value = "This node will now operate as the singleton provider of the %s service")
-    void electedMaster(String service);
+    void startSingleton(String service);
 
     @LogMessage(level = INFO)
     @Message(id = 2, value = "This node will no longer operate as the singleton provider of the %s service")
-    void electedSlave(String service);
+    void stopSingleton(String service);
 
     @LogMessage(level = INFO)
     @Message(id = 3, value = "%s elected as the singleton provider of the %s service")

clustering/server/src/main/java/org/wildfly/clustering/server/provider/CacheServiceProviderRegistry.java

@@ -123,12 +123,9 @@ public void close() {
     }
 
     void register(Node node, T service) {
-        Set<Node> nodes = new CopyOnWriteArraySet<>(Collections.singleton(node));
-        Set<Node> existing = this.cache.getAdvancedCache().withFlags(Flag.FORCE_SYNCHRONOUS).putIfAbsent(service, nodes);
-        if (existing != null) {
-            if (existing.add(node)) {
-                this.cache.getAdvancedCache().withFlags(Flag.IGNORE_RETURN_VALUES).replace(service, existing);
-            }
+        Set<Node> nodes = this.cache.getAdvancedCache().withFlags(Flag.FORCE_SYNCHRONOUS).computeIfAbsent(service, key -> new CopyOnWriteArraySet<>(Collections.singleton(node)));
+        if (nodes.add(node)) {
+            this.cache.getAdvancedCache().withFlags(Flag.IGNORE_RETURN_VALUES).replace(service, nodes);
         }
     }
 
@@ -145,8 +142,8 @@ public Set<T> getServices() {
 
     @Override
     public void membershipChanged(List<Node> previousMembers, List<Node> members, final boolean merged) {
-        if (this.getGroup().isCoordinator()) {
-            this.executor.execute(() -> {
+        this.executor.execute(() -> {
+            if (this.getGroup().isCoordinator()) {
                 Set<Node> deadNodes = new HashSet<>(previousMembers);
                 deadNodes.removeAll(members);
                 Set<Node> newNodes = new HashSet<>(members);
@@ -172,18 +169,20 @@ public void membershipChanged(List<Node> previousMembers, List<Node> members, fi
                         }
                     }
                 }
-            });
-        }
+            }
+        });
     }
 
     @CacheEntryCreated
     @CacheEntryModified
     public void modified(CacheEntryEvent<ServiceName, Set<Node>> event) {
         if (event.isPre()) return;
-        Listener listener = this.listeners.get(event.getKey());
-        if (listener != null) {
-            listener.providersChanged(event.getValue());
-        }
+        this.executor.execute(() -> {
+            Listener listener = this.listeners.get(event.getKey());
+            if (listener != null) {
+                listener.providersChanged(event.getValue());
+            }
+        });
     }
 
     List<T> getServices(Node node) {

clustering/server/src/main/java/org/wildfly/clustering/server/singleton/CacheSingletonServiceBuilder.java

@@ -252,6 +252,7 @@ public void providersChanged(Set<Node> nodes) {
     public void start() {
         // If we were not already master
         if (this.master.compareAndSet(false, true)) {
+            ClusteringServerLogger.ROOT_LOGGER.startSingleton(this.singletonServiceName.getCanonicalName());
             ServiceController<?> service = this.serviceRegistry.getRequiredService(this.targetServiceName);
             try {
                 ServiceContainerHelper.start(service);
@@ -266,6 +267,7 @@ public void start() {
     public void stop() {
         // If we were the previous master
         if (this.master.compareAndSet(true, false)) {
+            ClusteringServerLogger.ROOT_LOGGER.stopSingleton(this.singletonServiceName.getCanonicalName());
             ServiceContainerHelper.stop(this.serviceRegistry.getRequiredService(this.targetServiceName));
         }
     }
@@ -291,7 +293,7 @@ private AtomicReference<T> getRemoteValueRef() {
             Map<Node, CommandResponse<AtomicReference<T>>> results = Collections.emptyMap();
             while (results.isEmpty()) {
                 if (!CacheSingletonServiceBuilder.this.started) {
-                    throw new IllegalStateException(ClusteringServerLogger.ROOT_LOGGER.notStarted(CacheSingletonServiceBuilder.this.singletonServiceName.getCanonicalName()));
+                    throw ClusteringServerLogger.ROOT_LOGGER.notStarted(CacheSingletonServiceBuilder.this.singletonServiceName.getCanonicalName());
                 }
                 results = CacheSingletonServiceBuilder.this.dispatcher.executeOnCluster(new SingletonValueCommand<T>());
                 Iterator<CommandResponse<AtomicReference<T>>> responses = results.values().iterator();
@@ -321,6 +323,8 @@ private AtomicReference<T> getRemoteValueRef() {
                 }
             }
             return results.values().iterator().next().get();
+        } catch (RuntimeException e) {
+            throw e;
         } catch (Exception e) {
             throw new IllegalStateException(e);
         }

testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/singleton/SingletonDeploymentDescriptorTestCase.java

@@ -34,26 +34,26 @@
  */
 public class SingletonDeploymentDescriptorTestCase extends SingletonDeploymentTestCase {
 
-    private static final String DEPLOYMENT_NAME = "singleton-deployment-descriptor.war";
+    private static final String DEPLOYMENT_NAME = "singleton-deployment-descriptor";
 
     public SingletonDeploymentDescriptorTestCase() {
         super(DEPLOYMENT_NAME);
     }
 
-    @Deployment(name = DEPLOYMENT_1, managed = false, testable = false)
+    @Deployment(name = SINGLETON_DEPLOYMENT_1, managed = false, testable = false)
     @TargetsContainer(CONTAINER_1)
     public static Archive<?> deployment0() {
         return createDeployment();
     }
 
-    @Deployment(name = DEPLOYMENT_2, managed = false, testable = false)
+    @Deployment(name = SINGLETON_DEPLOYMENT_2, managed = false, testable = false)
     @TargetsContainer(CONTAINER_2)
     public static Archive<?> deployment1() {
         return createDeployment();
     }
 
     private static Archive<?> createDeployment() {
-        WebArchive war = ShrinkWrap.create(WebArchive.class, DEPLOYMENT_NAME);
+        WebArchive war = ShrinkWrap.create(WebArchive.class, DEPLOYMENT_NAME + ".war");
         war.addPackage(TraceServlet.class.getPackage());
         war.addAsManifestResource(SingletonDeploymentDescriptorTestCase.class.getPackage(), "singleton-deployment.xml", "singleton-deployment.xml");
         return war;

testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/singleton/SingletonDeploymentJBossAllTestCase.java

@@ -34,26 +34,26 @@
  */
 public class SingletonDeploymentJBossAllTestCase extends SingletonDeploymentTestCase {
 
-    private static final String DEPLOYMENT_NAME = "singleton-deployment-jboss-all.war";
+    private static final String DEPLOYMENT_NAME = "singleton-deployment-jboss-all";
 
     public SingletonDeploymentJBossAllTestCase() {
         super(DEPLOYMENT_NAME);
     }
 
-    @Deployment(name = DEPLOYMENT_1, managed = false, testable = false)
+    @Deployment(name = SINGLETON_DEPLOYMENT_1, managed = false, testable = false)
     @TargetsContainer(CONTAINER_1)
     public static Archive<?> deployment0() {
         return createDeployment();
     }
 
-    @Deployment(name = DEPLOYMENT_2, managed = false, testable = false)
+    @Deployment(name = SINGLETON_DEPLOYMENT_2, managed = false, testable = false)
     @TargetsContainer(CONTAINER_2)
     public static Archive<?> deployment1() {
         return createDeployment();
     }
 
     private static Archive<?> createDeployment() {
-        WebArchive war = ShrinkWrap.create(WebArchive.class, DEPLOYMENT_NAME);
+        WebArchive war = ShrinkWrap.create(WebArchive.class, DEPLOYMENT_NAME + ".war");
         war.addPackage(TraceServlet.class.getPackage());
         war.addAsManifestResource(SingletonDeploymentJBossAllTestCase.class.getPackage(), "jboss-all.xml", "jboss-all.xml");
         return war;

testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/singleton/SingletonDeploymentTestCase.java

@@ -33,14 +33,19 @@
 import org.apache.http.client.methods.HttpTrace;
 import org.apache.http.client.utils.HttpClientUtils;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.OperateOnDeployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.as.test.clustering.cluster.ClusterAbstractTestCase;
 import org.jboss.as.test.clustering.cluster.singleton.servlet.TraceServlet;
 import org.jboss.as.test.http.util.TestHttpClientUtils;
 import org.jboss.as.test.shared.TimeoutUtil;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,24 +57,49 @@
 @RunAsClient
 public abstract class SingletonDeploymentTestCase extends ClusterAbstractTestCase {
 
-    @SuppressWarnings("unused")
-    private final String deploymentName;
+    private static final String DEPLOYMENT_NAME = "singleton-deployment-helper.war";
+    static final String SINGLETON_DEPLOYMENT_1 = "singleton-deployment-0";
+    static final String SINGLETON_DEPLOYMENT_2 = "singleton-deployment-1";
+
+    @Deployment(name = DEPLOYMENT_1, managed = false, testable = false)
+    @TargetsContainer(CONTAINER_1)
+    public static Archive<?> deploymentHelper0() {
+        return createDeployment();
+    }
+
+    @Deployment(name = DEPLOYMENT_2, managed = false, testable = false)
+    @TargetsContainer(CONTAINER_2)
+    public static Archive<?> deploymentHelper1() {
+        return createDeployment();
+    }
+
+    private static Archive<?> createDeployment() {
+        WebArchive war = ShrinkWrap.create(WebArchive.class, DEPLOYMENT_NAME);
+        war.addPackage(TraceServlet.class.getPackage());
+        return war;
+    }
 
     public static final int DELAY = TimeoutUtil.adjust(5000);
 
-    protected SingletonDeploymentTestCase(String deploymentName) {
+    private final String deploymentName;
+
+    SingletonDeploymentTestCase(String deploymentName) {
         this.deploymentName = deploymentName;
     }
 
     @Test
     public void test(
             @ArquillianResource(TraceServlet.class) @OperateOnDeployment(DEPLOYMENT_1) URL baseURL1,
-            @ArquillianResource() @OperateOnDeployment(DEPLOYMENT_2) URL baseURL2)
+            @ArquillianResource(TraceServlet.class) @OperateOnDeployment(DEPLOYMENT_2) URL baseURL2)
                     throws IOException, URISyntaxException, InterruptedException {
 
-        URI uri1 = TraceServlet.createURI(baseURL1);
-        // baseURL2 will not have been resolved, since the deployment would not have started
-        URI uri2 = TraceServlet.createURI(new URL(baseURL2.getProtocol(), baseURL2.getHost(), baseURL2.getPort(), baseURL1.getFile()));
+        this.deploy(SINGLETON_DEPLOYMENT_1);
+        Thread.sleep(DELAY);
+        this.deploy(SINGLETON_DEPLOYMENT_2);
+        Thread.sleep(DELAY);
+
+        URI uri1 = TraceServlet.createURI(new URL(baseURL1.getProtocol(), baseURL1.getHost(), baseURL1.getPort(), "/" + this.deploymentName + "/"));
+        URI uri2 = TraceServlet.createURI(new URL(baseURL2.getProtocol(), baseURL2.getHost(), baseURL2.getPort(), "/" + this.deploymentName + "/"));
 
         try (CloseableHttpClient client = TestHttpClientUtils.promiscuousCookieHttpClient()) {
             HttpResponse response = client.execute(new HttpTrace(uri1));
@@ -86,7 +116,7 @@ public void test(
                 HttpClientUtils.closeQuietly(response);
             }
 
-            this.undeploy(DEPLOYMENT_1);
+            this.undeploy(SINGLETON_DEPLOYMENT_1);
 
             Thread.sleep(DELAY);
 
@@ -104,7 +134,7 @@ public void test(
                 HttpClientUtils.closeQuietly(response);
             }
 
-            this.deploy(DEPLOYMENT_1);
+            this.deploy(SINGLETON_DEPLOYMENT_1);
 
             Thread.sleep(DELAY);
 
@@ -122,7 +152,7 @@ public void test(
                 HttpClientUtils.closeQuietly(response);
             }
 
-            this.undeploy(DEPLOYMENT_2);
+            this.undeploy(SINGLETON_DEPLOYMENT_2);
 
             Thread.sleep(DELAY);
 
@@ -140,7 +170,7 @@ public void test(
                 HttpClientUtils.closeQuietly(response);
             }
 
-            this.deploy(DEPLOYMENT_2);
+            this.deploy(SINGLETON_DEPLOYMENT_2);
 
             Thread.sleep(DELAY);
 
@@ -157,6 +187,8 @@ public void test(
             } finally {
                 HttpClientUtils.closeQuietly(response);
             }
+        } finally {
+            this.undeploy(SINGLETON_DEPLOYMENT_1, SINGLETON_DEPLOYMENT_2);
         }
     }
 }