Bug 38084318 - Build: Intermittent Topics channel count test failure

(merge main -> ce/main 117096)

[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 117097]

Author: thegridman

prj/coherence-bedrock/coherence-bedrock-testing-support/src/main/java/com/oracle/bedrock/junit/CoherenceClusterResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -79,7 +79,7 @@ public CoherenceCluster getCluster()
 
 
     @Override
-    protected void before() throws Throwable
+    public void before() throws Throwable
         {
         if (launchDefinitions.isEmpty())
             {
@@ -100,7 +100,7 @@ protected void before() throws Throwable
 
 
     @Override
-    protected void after()
+    public void after()
         {
         // clean up the sessions
         synchronized (f_mapCCF)

prj/test/functional/topics/src/main/java/topics/AbstractTopicChannelCountTests.java

@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -13,6 +13,7 @@
 import com.oracle.bedrock.runtime.coherence.options.CacheConfig;
 import com.oracle.bedrock.runtime.coherence.options.ClusterName;
 import com.oracle.bedrock.runtime.coherence.options.LocalHost;
+import com.oracle.bedrock.runtime.coherence.options.LocalStorage;
 import com.oracle.bedrock.runtime.coherence.options.Logging;
 import com.oracle.bedrock.runtime.coherence.options.RoleName;
 import com.oracle.bedrock.runtime.coherence.options.WellKnownAddress;
@@ -35,6 +36,8 @@
 import com.tangosol.net.topic.Publisher;
 import com.tangosol.net.topic.Subscriber;
 import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -72,12 +75,45 @@
 @SuppressWarnings({"resource", "unchecked"})
 public abstract class AbstractTopicChannelCountTests
     {
+    @BeforeClass
+    public static void setup()
+        {
+        System.setProperty(LocalStorage.PROPERTY, "false");
+        }
+
+    @Before
+    public void startCluster() throws Throwable
+        {
+        if (m_cluster != null)
+            {
+            m_cluster.getCluster().close();
+            }
+
+        m_cluster = new CoherenceClusterResource()
+                .with(ClusterName.of(m_testWatcher.getMethodName()),
+                        Logging.atMax(),
+                        LocalHost.only(),
+                        WellKnownAddress.loopback(),
+                        IPv4Preferred.yes())
+                .include(STORAGE_MEMBER_COUNT,
+                        CoherenceClusterMember.class,
+                        CacheConfig.of(CACHE_CONFIG_FILE),
+                        SystemProperty.of(PROP_CHANNELS, STORAGE_CHANNEL_COUNT),
+                        DisplayName.of("Storage"),
+                        RoleName.of("storage"),
+                        JmxFeature.enabled(),
+                        m_testLogs.builder());
+
+        m_cluster.before();
+        }
+
     @After
     public void cleanup()
         {
         Cluster cluster = CacheFactory.getCluster();
         CacheFactory.shutdown();
         Eventually.assertDeferred(cluster::isRunning, is(false));
+        m_cluster.after();
         }
 
     @Test
@@ -852,20 +888,5 @@ public String toString()
     @Rule(order = 1)
     public TestName m_testWatcher = new TestName();
 
-    @Rule(order = 2)
-    public CoherenceClusterResource m_cluster =
-            new CoherenceClusterResource()
-                    .with(ClusterName.of(m_testWatcher.getMethodName()),
-                          Logging.atMax(),
-                          LocalHost.only(),
-                          WellKnownAddress.loopback(),
-                          IPv4Preferred.yes())
-                    .include(STORAGE_MEMBER_COUNT,
-                             CoherenceClusterMember.class,
-                             CacheConfig.of(CACHE_CONFIG_FILE),
-                             SystemProperty.of(PROP_CHANNELS, STORAGE_CHANNEL_COUNT),
-                             DisplayName.of("Storage"),
-                             RoleName.of("storage"),
-                             JmxFeature.enabled(),
-                             m_testLogs.builder());
+    public CoherenceClusterResource m_cluster;
     }

prj/test/functional/topics/src/main/java/topics/callables/GetChannelsWithMessages.java

@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
  */
 package topics.callables;
 
 import com.oracle.bedrock.runtime.concurrent.RemoteCallable;
+import com.oracle.coherence.common.base.Logger;
 import com.tangosol.internal.net.topic.impl.paged.PagedTopicCaches;
 import com.tangosol.internal.net.topic.impl.paged.model.Page;
 import com.tangosol.net.Coherence;
@@ -31,14 +32,17 @@ public GetChannelsWithMessages(String sTopicName)
     @Override
     public Set<Integer> call() throws Exception
         {
+        Logger.info("Invoking GetChannelsWithMessages");
         Session          session = Coherence.getInstance().getSession();
         NamedTopic<?>    topic   = session.getTopic(m_sTopicName);
-        PagedTopicCaches caches  = new PagedTopicCaches(m_sTopicName, (PagedTopicService) topic.getService());
+        PagedTopicCaches caches  = new PagedTopicCaches(m_sTopicName, (PagedTopicService) topic.getService(), false);
 
-        return caches.Pages.keySet()
+        Set<Integer> set = caches.Pages.keySet()
                 .stream()
                 .map(Page.Key::getChannelId)
                 .collect(Collectors.toSet());
+        Logger.info("Invoked GetChannelsWithMessages, result=" + set);
+        return set;
         }
 
     private final String m_sTopicName;