Skip to content

Commit 599f83d

Browse files
chpatel3chpatel3
committed
Bug 38000057 - Build: Intermittent test failure in HealthCheckTests.shouldBeHealthyMultipleMembers (integ ce/main -> ce/25.09 @ 117011)
(auto-submit 117042 after successfully running remote remote.full) Job ID: job.9.20250624125629.16583 [git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v25.03/": change = 117052]
1 parent 1bac80b commit 599f83d

File tree

2 files changed

+46
-44
lines changed

2 files changed

+46
-44
lines changed

‎prj/test/functional/health/src/main/java/health/HealthCheckTests.java

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ public void cleanupPersistence(TestInfo testInfo)
8282
@Test
8383
void shouldBeHealthySingleMember()
8484
{
85-
LocalPlatform platform = LocalPlatform.get();
86-
Capture<Integer> nHealthPort = new Capture<>(platform.getAvailablePorts());
87-
Capture<Integer> managementPort = new Capture<>(platform.getAvailablePorts());
85+
LocalPlatform platform = LocalPlatform.get();
86+
Integer nHealthPort = platform.getAvailablePorts().next();
87+
Integer managementPort = platform.getAvailablePorts().next();
8888

8989
try (CoherenceClusterMember ignored = platform.launch(CoherenceClusterMember.class,
9090
ClassName.of(Coherence.class),
@@ -109,9 +109,9 @@ void shouldBeHealthySingleMember()
109109
@Test
110110
public void shouldBeHealthyMultipleMembers() throws Exception
111111
{
112-
LocalPlatform platform = LocalPlatform.get();
113-
Capture<Integer> nHealthPort1 = new Capture<>(platform.getAvailablePorts());
114-
Capture<Integer> nHealthPort2 = new Capture<>(platform.getAvailablePorts());
112+
LocalPlatform platform = LocalPlatform.get();
113+
Integer nHealthPort1 = platform.getAvailablePorts().next();
114+
Integer nHealthPort2 = platform.getAvailablePorts().next();
115115

116116
try (CoherenceClusterMember app1 = platform.launch(CoherenceClusterMember.class,
117117
ClassName.of(Coherence.class),
@@ -133,6 +133,8 @@ public void shouldBeHealthyMultipleMembers() throws Exception
133133
DisplayName.of("Storage-1"),
134134
SystemProperty.of(PROP_HEALTH_PORT, nHealthPort2)))
135135
{
136+
Eventually.assertDeferred(() -> isServiceOneRunning(app1), is(true));
137+
Eventually.assertDeferred(() -> isServiceOneRunning(app2), is(true));
136138

137139
Eventually.assertDeferred(() -> httpRequest(nHealthPort1, HealthCheck.PATH_STARTED), is(200));
138140
Eventually.assertDeferred(() -> httpRequest(nHealthPort2, HealthCheck.PATH_STARTED), is(200));
@@ -156,9 +158,9 @@ public void shouldBeHealthyMultipleMembers() throws Exception
156158
@Test
157159
public void shouldBeHealthyWhenStorageDisabled()
158160
{
159-
LocalPlatform platform = LocalPlatform.get();
160-
Capture<Integer> nHealthPort = new Capture<>(platform.getAvailablePorts());
161-
Capture<Integer> managementPort = new Capture<>(platform.getAvailablePorts());
161+
LocalPlatform platform = LocalPlatform.get();
162+
Integer nHealthPort = platform.getAvailablePorts().next();
163+
Integer managementPort = platform.getAvailablePorts().next();
162164

163165
try (CoherenceClusterMember ignored = platform.launch(CoherenceClusterMember.class,
164166
ClassName.of(Coherence.class),
@@ -183,11 +185,11 @@ public void shouldBeHealthyWhenStorageDisabled()
183185
@Test
184186
public void shouldBeStatusHAMultipleMembersStorageEnabledAndDisabledActivePersistence()
185187
{
186-
File buildDir = MavenProjectFileUtils.ensureTestOutputFolder(getClass(), "shouldBeStatusHAMultipleMembersStorageEnabledAndDisabledActivePersistence");
187-
File activeDir = new File(buildDir, "persistence");
188-
LocalPlatform platform = LocalPlatform.get();
189-
Capture<Integer> nHealthPort1 = new Capture<>(platform.getAvailablePorts());
190-
Capture<Integer> nHealthPort2 = new Capture<>(platform.getAvailablePorts());
188+
File buildDir = MavenProjectFileUtils.ensureTestOutputFolder(getClass(), "shouldBeStatusHAMultipleMembersStorageEnabledAndDisabledActivePersistence");
189+
File activeDir = new File(buildDir, "persistence");
190+
LocalPlatform platform = LocalPlatform.get();
191+
Integer nHealthPort1 = platform.getAvailablePorts().next();
192+
Integer nHealthPort2 = platform.getAvailablePorts().next();
191193

192194
activeDir.mkdirs();
193195
activeDir.deleteOnExit();
@@ -227,9 +229,9 @@ public void shouldBeStatusHAMultipleMembersStorageEnabledAndDisabledActivePersis
227229
@Test
228230
public void shouldBeStatusHAMultipleMemberDifferentServices()
229231
{
230-
LocalPlatform platform = LocalPlatform.get();
231-
Capture<Integer> nHealthPort1 = new Capture<>(platform.getAvailablePorts());
232-
Capture<Integer> nHealthPort2 = new Capture<>(platform.getAvailablePorts());
232+
LocalPlatform platform = LocalPlatform.get();
233+
Integer nHealthPort1 = platform.getAvailablePorts().next();
234+
Integer nHealthPort2 = platform.getAvailablePorts().next();
233235

234236
try (CoherenceClusterMember app1 = platform.launch(CoherenceClusterMember.class,
235237
ClassName.of(Coherence.class),
@@ -265,9 +267,9 @@ public void shouldBeStatusHAMultipleMemberDifferentServices()
265267
@Test
266268
public void shouldBeStatusHAMultipleMemberWithBackupCountTwoIgnoringService()
267269
{
268-
LocalPlatform platform = LocalPlatform.get();
269-
Capture<Integer> nHealthPort1 = new Capture<>(platform.getAvailablePorts());
270-
Capture<Integer> nHealthPort2 = new Capture<>(platform.getAvailablePorts());
270+
LocalPlatform platform = LocalPlatform.get();
271+
Integer nHealthPort1 = platform.getAvailablePorts().next();
272+
Integer nHealthPort2 = platform.getAvailablePorts().next();
271273

272274
try (CoherenceClusterMember app1 = platform.launch(CoherenceClusterMember.class,
273275
ClassName.of(Coherence.class),
@@ -306,8 +308,8 @@ public void shouldBeStatusHAMultipleMemberWithBackupCountTwoIgnoringService()
306308
@Test
307309
public void shouldSuspendAllServicesSingleMember()
308310
{
309-
LocalPlatform platform = LocalPlatform.get();
310-
Capture<Integer> httpPort = new Capture<>(platform.getAvailablePorts());
311+
LocalPlatform platform = LocalPlatform.get();
312+
Integer httpPort = platform.getAvailablePorts().next();
311313

312314
try (CoherenceClusterMember app = platform.launch(CoherenceClusterMember.class,
313315
ClassName.of(Coherence.class),
@@ -344,9 +346,9 @@ public void shouldSuspendAllServicesSingleMember()
344346
@Test
345347
public void shouldSuspendAllServicesMultipleMembers()
346348
{
347-
LocalPlatform platform = LocalPlatform.get();
348-
Capture<Integer> nHealthPort1 = new Capture<>(platform.getAvailablePorts());
349-
Capture<Integer> nHealthPort2 = new Capture<>(platform.getAvailablePorts());
349+
LocalPlatform platform = LocalPlatform.get();
350+
Integer nHealthPort1 = platform.getAvailablePorts().next();
351+
Integer nHealthPort2 = platform.getAvailablePorts().next();
350352

351353
try (CoherenceClusterMember app1 = platform.launch(CoherenceClusterMember.class,
352354
ClassName.of(Coherence.class),
@@ -401,8 +403,8 @@ public void shouldSuspendAllServicesMultipleMembers()
401403
@Test
402404
public void shouldSuspendSpecifiedServicesSingleMember()
403405
{
404-
LocalPlatform platform = LocalPlatform.get();
405-
Capture<Integer> httpPort = new Capture<>(platform.getAvailablePorts());
406+
LocalPlatform platform = LocalPlatform.get();
407+
Integer httpPort = platform.getAvailablePorts().next();
406408

407409
try (CoherenceClusterMember app = platform.launch(CoherenceClusterMember.class,
408410
ClassName.of(Coherence.class),
@@ -438,8 +440,8 @@ public void shouldSuspendSpecifiedServicesSingleMember()
438440
@Test
439441
public void shouldResumeSpecifiedServicesSingleMember()
440442
{
441-
LocalPlatform platform = LocalPlatform.get();
442-
Capture<Integer> httpPort = new Capture<>(platform.getAvailablePorts());
443+
LocalPlatform platform = LocalPlatform.get();
444+
Integer httpPort = platform.getAvailablePorts().next();
443445

444446
try (CoherenceClusterMember app = platform.launch(CoherenceClusterMember.class,
445447
ClassName.of(Coherence.class),
@@ -476,9 +478,9 @@ public void shouldResumeSpecifiedServicesSingleMember()
476478
@Test
477479
public void shouldNotSuspendServicesWithDifferentRoles()
478480
{
479-
LocalPlatform platform = LocalPlatform.get();
480-
Capture<Integer> nHealthPort1 = new Capture<>(platform.getAvailablePorts());
481-
Capture<Integer> nHealthPort2 = new Capture<>(platform.getAvailablePorts());
481+
LocalPlatform platform = LocalPlatform.get();
482+
Integer nHealthPort1 = platform.getAvailablePorts().next();
483+
Integer nHealthPort2 = platform.getAvailablePorts().next();
482484

483485
try (CoherenceClusterMember app1 = platform.launch(CoherenceClusterMember.class,
484486
ClassName.of(Coherence.class),
@@ -529,9 +531,9 @@ public void shouldNotSuspendServicesWithDifferentRoles()
529531
@Test
530532
public void shouldNotSuspendStorageDisabledServices()
531533
{
532-
LocalPlatform platform = LocalPlatform.get();
533-
Capture<Integer> nHealthPort1 = new Capture<>(platform.getAvailablePorts());
534-
Capture<Integer> nHealthPort2 = new Capture<>(platform.getAvailablePorts());
534+
LocalPlatform platform = LocalPlatform.get();
535+
Integer nHealthPort1 = platform.getAvailablePorts().next();
536+
Integer nHealthPort2 = platform.getAvailablePorts().next();
535537

536538
try (CoherenceClusterMember app1 = platform.launch(CoherenceClusterMember.class,
537539
ClassName.of(Coherence.class),
@@ -582,9 +584,9 @@ public void shouldNotSuspendStorageDisabledServices()
582584
@Test
583585
public void shouldNotSuspendNonPersistentServices()
584586
{
585-
LocalPlatform platform = LocalPlatform.get();
586-
Capture<Integer> nHealthPort1 = new Capture<>(platform.getAvailablePorts());
587-
Capture<Integer> nHealthPort2 = new Capture<>(platform.getAvailablePorts());
587+
LocalPlatform platform = LocalPlatform.get();
588+
Integer nHealthPort1 = platform.getAvailablePorts().next();
589+
Integer nHealthPort2 = platform.getAvailablePorts().next();
588590

589591
try (CoherenceClusterMember app1 = platform.launch(CoherenceClusterMember.class,
590592
ClassName.of(Coherence.class),
@@ -631,8 +633,8 @@ public void shouldNotSuspendNonPersistentServices()
631633
@Test
632634
public void shouldNotResumeExcludedServices()
633635
{
634-
LocalPlatform platform = LocalPlatform.get();
635-
Capture<Integer> nHealthPort = new Capture<>(platform.getAvailablePorts());
636+
LocalPlatform platform = LocalPlatform.get();
637+
Integer nHealthPort = platform.getAvailablePorts().next();
636638

637639
try (CoherenceClusterMember app = platform.launch(CoherenceClusterMember.class,
638640
ClassName.of(Coherence.class),
@@ -673,7 +675,7 @@ public void shouldNotResumeExcludedServices()
673675

674676
// ----- helper methods -------------------------------------------------
675677

676-
public int httpRequest(Capture<Integer> nPort, String sRequest)
678+
public int httpRequest(Integer nPort, String sRequest)
677679
{
678680
try
679681
{
@@ -689,7 +691,7 @@ public int httpRequest(Capture<Integer> nPort, String sRequest)
689691
}
690692
}
691693

692-
public HttpResponse doHttpRequest(Capture<Integer> nPort, String sRequest) throws Exception
694+
public HttpResponse doHttpRequest(Integer nPort, String sRequest) throws Exception
693695
{
694696
if (!sRequest.startsWith("/"))
695697
{
@@ -698,7 +700,7 @@ public HttpResponse doHttpRequest(Capture<Integer> nPort, String sRequest) throw
698700

699701
HttpRequest request = HttpRequest.newBuilder()
700702
.GET()
701-
.uri(URI.create("http://127.0.0.1:" + nPort.get() + sRequest))
703+
.uri(URI.create("http://127.0.0.1:" + nPort + sRequest))
702704
.build();
703705

704706
HttpResponse<byte[]> response = m_client.send(request, HttpResponse.BodyHandlers.ofByteArray());

‎tools/bin/github-deploy-snapshots.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ mvn -B clean install -Dproject.official=true -P-modules --file prj/pom.xml -Dski
2424
mvn -B clean install -Dproject.official=true -Pmodules,-coherence,docs -nsu --file prj/pom.xml -DskipTests -s .github/maven/settings.xml
2525

2626
echo "Deploying version ${CURRENT_VERSION}"
27-
mvn -B deploy -Dproject.official=true -P-modules -nsu --file prj/pom.xml -DskipTests -s .github/maven/settings.xml
27+
mvn -B deploy -Dproject.official=true -P-modules,!coherence-testing-data -nsu --file prj/pom.xml -DskipTests -s .github/maven/settings.xml
2828
mvn -B deploy -Dproject.official=true -Pmodules,-coherence,docs -nsu --file prj/pom.xml -DskipTests -s .github/maven/settings.xml

0 commit comments

Comments
 (0)