Skip to content

Commit 53a374a

Browse files
committed
Bug 36405782 - Build: *RemoteCountDownLatchIT -> shouldAcquireAndCountDownWithRollingRestart (merge main -> ce/main @ 107702)
[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 107712]
1 parent 4d78aa9 commit 53a374a

24 files changed

+94
-46
lines changed

prj/test/functional/concurrent/src/main/java/concurrent/ClusteredRemoteCountDownLatchIT.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -10,6 +10,7 @@
1010

1111
import com.oracle.bedrock.runtime.LocalPlatform;
1212

13+
import com.oracle.bedrock.runtime.coherence.CoherenceCluster;
1314
import com.oracle.bedrock.runtime.coherence.options.ClusterPort;
1415
import com.oracle.bedrock.runtime.coherence.options.LocalHost;
1516
import com.oracle.bedrock.runtime.coherence.options.LocalStorage;
@@ -22,6 +23,7 @@
2223

2324
import com.oracle.bedrock.runtime.options.DisplayName;
2425

26+
import com.oracle.bedrock.runtime.options.StabilityPredicate;
2527
import com.tangosol.net.Coherence;
2628

2729
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -71,7 +73,8 @@ public ClusteredRemoteCountDownLatchIT()
7173
Multicast.ttl(0),
7274
IPv4Preferred.yes(),
7375
logs,
74-
ClusterPort.automatic())
76+
ClusterPort.automatic(),
77+
StabilityPredicate.of(CoherenceCluster.Predicates.isCoherenceRunning()))
7578
.include(2,
7679
DisplayName.of("storage"),
7780
RoleName.of("storage"),

prj/test/functional/concurrent/src/main/java/concurrent/ClusteredRemoteSemaphoreExtendIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -66,7 +66,8 @@ public ClusteredRemoteSemaphoreExtendIT()
6666
Multicast.ttl(0),
6767
IPv4Preferred.yes(),
6868
logs,
69-
ClusterPort.automatic())
69+
ClusterPort.automatic(),
70+
StabilityPredicate.of(CoherenceCluster.Predicates.isCoherenceRunning()))
7071
.include(3,
7172
DisplayName.of("storage"),
7273
RoleName.of("storage"),

prj/test/functional/concurrent/src/main/java/concurrent/ClusteredRemoteSemaphoreExtendProxyIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -67,7 +67,8 @@ public ClusteredRemoteSemaphoreExtendProxyIT()
6767
Multicast.ttl(0),
6868
IPv4Preferred.yes(),
6969
logs,
70-
ClusterPort.automatic())
70+
ClusterPort.automatic(),
71+
StabilityPredicate.of(CoherenceCluster.Predicates.isCoherenceRunning()))
7172
.include(3,
7273
DisplayName.of("storage"),
7374
RoleName.of("storage"),

prj/test/functional/concurrent/src/main/java/concurrent/ClusteredRemoteSemaphoreIT.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -8,6 +8,7 @@
88

99
import com.oracle.bedrock.junit.CoherenceClusterExtension;
1010
import com.oracle.bedrock.runtime.LocalPlatform;
11+
import com.oracle.bedrock.runtime.coherence.CoherenceCluster;
1112
import com.oracle.bedrock.runtime.coherence.options.ClusterPort;
1213
import com.oracle.bedrock.runtime.coherence.options.LocalHost;
1314
import com.oracle.bedrock.runtime.coherence.options.LocalStorage;
@@ -18,6 +19,7 @@
1819
import com.oracle.bedrock.runtime.java.options.IPv4Preferred;
1920
import com.oracle.bedrock.runtime.options.DisplayName;
2021

22+
import com.oracle.bedrock.runtime.options.StabilityPredicate;
2123
import com.tangosol.net.Coherence;
2224

2325
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -63,7 +65,8 @@ public ClusteredRemoteSemaphoreIT()
6365
Multicast.ttl(0),
6466
IPv4Preferred.yes(),
6567
logs,
66-
ClusterPort.automatic())
68+
ClusterPort.automatic(),
69+
StabilityPredicate.of(CoherenceCluster.Predicates.isCoherenceRunning()))
6770
.include(3,
6871
DisplayName.of("storage"),
6972
RoleName.of("storage"),

prj/test/functional/concurrent/src/main/java/concurrent/PofClusteredRemoteCountDownLatchIT.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -10,6 +10,7 @@
1010

1111
import com.oracle.bedrock.runtime.LocalPlatform;
1212

13+
import com.oracle.bedrock.runtime.coherence.CoherenceCluster;
1314
import com.oracle.bedrock.runtime.coherence.options.ClusterPort;
1415
import com.oracle.bedrock.runtime.coherence.options.LocalHost;
1516
import com.oracle.bedrock.runtime.coherence.options.LocalStorage;
@@ -23,6 +24,7 @@
2324

2425
import com.oracle.bedrock.runtime.options.DisplayName;
2526

27+
import com.oracle.bedrock.runtime.options.StabilityPredicate;
2628
import com.tangosol.net.Coherence;
2729

2830
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -72,7 +74,8 @@ public PofClusteredRemoteCountDownLatchIT()
7274
logs,
7375
ClusterPort.automatic(),
7476
Pof.enabled(),
75-
Pof.config("coherence-concurrent-pof-config.xml"))
77+
Pof.config("coherence-concurrent-pof-config.xml"),
78+
StabilityPredicate.of(CoherenceCluster.Predicates.isCoherenceRunning()))
7679
.include(2,
7780
DisplayName.of("storage"),
7881
RoleName.of("storage"),

prj/test/functional/concurrent/src/main/java/concurrent/PofClusteredRemoteSemaphoreExtendIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -70,7 +70,8 @@ public PofClusteredRemoteSemaphoreExtendIT()
7070
logs,
7171
ClusterPort.automatic(),
7272
Pof.enabled(),
73-
Pof.config("coherence-concurrent-pof-config.xml"))
73+
Pof.config("coherence-concurrent-pof-config.xml"),
74+
StabilityPredicate.of(CoherenceCluster.Predicates.isCoherenceRunning()))
7475
.include(3,
7576
DisplayName.of("storage"),
7677
RoleName.of("storage"),

prj/test/functional/concurrent/src/main/java/concurrent/PofClusteredRemoteSemaphoreExtendProxyIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -69,7 +69,8 @@ public PofClusteredRemoteSemaphoreExtendProxyIT()
6969
logs,
7070
ClusterPort.automatic(),
7171
Pof.enabled(),
72-
Pof.config("coherence-concurrent-pof-config.xml"))
72+
Pof.config("coherence-concurrent-pof-config.xml"),
73+
StabilityPredicate.of(CoherenceCluster.Predicates.isCoherenceRunning()))
7374
.include(3,
7475
DisplayName.of("storage"),
7576
RoleName.of("storage"),

prj/test/functional/concurrent/src/main/java/concurrent/PofClusteredRemoteSemaphoreIT.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -8,6 +8,7 @@
88

99
import com.oracle.bedrock.junit.CoherenceClusterExtension;
1010
import com.oracle.bedrock.runtime.LocalPlatform;
11+
import com.oracle.bedrock.runtime.coherence.CoherenceCluster;
1112
import com.oracle.bedrock.runtime.coherence.options.ClusterPort;
1213
import com.oracle.bedrock.runtime.coherence.options.LocalHost;
1314
import com.oracle.bedrock.runtime.coherence.options.LocalStorage;
@@ -19,6 +20,7 @@
1920
import com.oracle.bedrock.runtime.java.options.IPv4Preferred;
2021
import com.oracle.bedrock.runtime.options.DisplayName;
2122

23+
import com.oracle.bedrock.runtime.options.StabilityPredicate;
2224
import com.tangosol.net.Coherence;
2325

2426
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -66,7 +68,8 @@ public PofClusteredRemoteSemaphoreIT()
6668
logs,
6769
ClusterPort.automatic(),
6870
Pof.enabled(),
69-
Pof.config("coherence-concurrent-pof-config.xml"))
71+
Pof.config("coherence-concurrent-pof-config.xml"),
72+
StabilityPredicate.of(CoherenceCluster.Predicates.isCoherenceRunning()))
7073
.include(3,
7174
DisplayName.of("storage"),
7275
RoleName.of("storage"),

prj/test/functional/concurrent/src/main/java/concurrent/config/ConcurrentCacheConfigOverrideTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -10,6 +10,7 @@
1010

1111
import com.oracle.bedrock.runtime.LocalPlatform;
1212

13+
import com.oracle.bedrock.runtime.coherence.CoherenceCluster;
1314
import com.oracle.bedrock.runtime.coherence.options.ClusterPort;
1415
import com.oracle.bedrock.runtime.coherence.options.LocalHost;
1516
import com.oracle.bedrock.runtime.coherence.options.LocalStorage;
@@ -23,6 +24,7 @@
2324

2425
import com.oracle.bedrock.runtime.options.DisplayName;
2526

27+
import com.oracle.bedrock.runtime.options.StabilityPredicate;
2628
import com.oracle.bedrock.testsupport.deferred.Eventually;
2729

2830
import com.tangosol.net.Coherence;
@@ -61,7 +63,7 @@ public void testConcurrentCacheConfigOverride()
6163
// ----- data members ---------------------------------------------------
6264

6365
/**
64-
* Override file for concuurent cacheconfig xml.
66+
* Override file for concurrent cacheconfig xml.
6567
*/
6668
public final static String FILE_CFG_CACHE_OVERRIDE = "concurrent-cache-config-override.xml";
6769

@@ -80,7 +82,8 @@ public void testConcurrentCacheConfigOverride()
8082
LocalHost.only(),
8183
Multicast.ttl(0),
8284
IPv4Preferred.yes(),
83-
ClusterPort.automatic())
85+
ClusterPort.automatic(),
86+
StabilityPredicate.of(CoherenceCluster.Predicates.isCoherenceRunning()))
8487
.include(1,
8588
DisplayName.of("storage"),
8689
RoleName.of("storage"),

prj/test/functional/concurrent/src/main/java/concurrent/executor/RemoteExecutorExtendIT.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import com.oracle.bedrock.runtime.LocalPlatform;
1212

13+
import com.oracle.bedrock.runtime.coherence.CoherenceCluster;
1314
import com.oracle.bedrock.runtime.coherence.options.ClusterPort;
1415
import com.oracle.bedrock.runtime.coherence.options.LocalHost;
1516
import com.oracle.bedrock.runtime.coherence.options.LocalStorage;
@@ -22,6 +23,7 @@
2223

2324
import com.oracle.bedrock.runtime.options.DisplayName;
2425

26+
import com.oracle.bedrock.runtime.options.StabilityPredicate;
2527
import com.tangosol.net.Coherence;
2628

2729
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -66,7 +68,8 @@ protected Coherence getClient()
6668
Multicast.ttl(0),
6769
IPv4Preferred.yes(),
6870
logs,
69-
ClusterPort.automatic())
71+
ClusterPort.automatic(),
72+
StabilityPredicate.of(CoherenceCluster.Predicates.isCoherenceRunning()))
7073
.include(1,
7174
DisplayName.of("storage"),
7275
RoleName.of("storage"),

0 commit comments

Comments
 (0)