Skip to content

Commit 85a1b71

Browse files
rjeberhardrjeberhard
committed
Merge branch 'release/3.3' into release/3.4
2 parents f560d37 + b7186f8 commit 85a1b71

File tree

1 file changed

+43
-36
lines changed

1 file changed

+43
-36
lines changed

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicy.java

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkClusterReplicaCountMatches;
7070
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
7171
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
72+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
7273
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapAndVerify;
7374
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
7475
import static oracle.weblogic.kubernetes.utils.ImageUtils.createOcirRepoSecret;
@@ -226,23 +227,23 @@ public void beforeEach() {
226227
logger.info("Check admin service/pod {0} is created in namespace {1}",
227228
adminServerPodName, domainNamespace);
228229
checkPodReadyAndServiceExists(adminServerPodName,
229-
domainUid, domainNamespace);
230+
domainUid, domainNamespace);
230231

231232
for (int i = 1; i <= replicaCount; i++) {
232233
checkPodReadyAndServiceExists(managedServerPrefix + i,
233-
domainUid, domainNamespace);
234+
domainUid, domainNamespace);
234235
}
235236

236-
// Check configured cluster configuration is available
237+
// Check configured cluster configuration is available
237238
boolean isServerConfigured =
238-
checkManagedServerConfiguration(ingressHost, "config-cluster-server1");
239+
checkManagedServerConfiguration(ingressHost, "config-cluster-server1");
239240
assertTrue(isServerConfigured,
240241
"Could not find managed server from configured cluster");
241242
logger.info("Found managed server from configured cluster");
242243

243244
// Check standalone server configuration is available
244245
boolean isStandaloneServerConfigured =
245-
checkManagedServerConfiguration(ingressHost, "standalone-managed");
246+
checkManagedServerConfiguration(ingressHost, "standalone-managed");
246247
assertTrue(isStandaloneServerConfigured,
247248
"Could not find standalone managed server from configured cluster");
248249
logger.info("Found standalone managed server configuration");
@@ -311,14 +312,14 @@ void testAdminServerRestart() {
311312

312313
logger.info("Check managed server pods are not affected");
313314
Callable<Boolean> isDynRestarted =
314-
assertDoesNotThrow(() -> isPodRestarted(dynamicServerPodName,
315-
domainNamespace, dynTs));
315+
assertDoesNotThrow(() -> isPodRestarted(dynamicServerPodName,
316+
domainNamespace, dynTs));
316317
assertFalse(assertDoesNotThrow(isDynRestarted::call),
317318
"Dynamic managed server pod must not be restated");
318319

319320
Callable<Boolean> isCfgRestarted =
320-
assertDoesNotThrow(() -> isPodRestarted(configServerPodName,
321-
domainNamespace, cfgTs));
321+
assertDoesNotThrow(() -> isPodRestarted(configServerPodName,
322+
domainNamespace, cfgTs));
322323
assertFalse(assertDoesNotThrow(isCfgRestarted::call),
323324
"Configured managed server pod must not be restated");
324325

@@ -327,7 +328,7 @@ void testAdminServerRestart() {
327328
logger.info("Check admin service/pod {0} is created in namespace {1}",
328329
adminServerPodName, domainNamespace);
329330
checkPodReadyAndServiceExists(adminServerPodName,
330-
domainUid, domainNamespace);
331+
domainUid, domainNamespace);
331332
}
332333

333334
/**
@@ -350,7 +351,7 @@ void testConfigClusterRestart() {
350351
OffsetDateTime dynTs = getPodCreationTime(domainNamespace, dynamicServerPodName);
351352

352353
checkPodReadyAndServiceExists(configServerPodName,
353-
domainUid, domainNamespace);
354+
domainUid, domainNamespace);
354355
// startCluster.sh does not take any action on a running cluster
355356
String result = executeLifecycleScript(START_CLUSTER_SCRIPT, CLUSTER_LIFECYCLE, CLUSTER_2);
356357
assertTrue(result.contains("No changes needed"), "startCluster.sh shouldn't make changes");
@@ -366,8 +367,8 @@ void testConfigClusterRestart() {
366367
logger.info("Check dynamic managed server pods are not affected");
367368

368369
Callable<Boolean> isDynRestarted =
369-
assertDoesNotThrow(() -> isPodRestarted(dynamicServerPodName,
370-
domainNamespace, dynTs));
370+
assertDoesNotThrow(() -> isPodRestarted(dynamicServerPodName,
371+
domainNamespace, dynTs));
371372
assertFalse(assertDoesNotThrow(isDynRestarted::call),
372373
"Dynamic managed server pod must not be restated");
373374

@@ -378,7 +379,7 @@ void testConfigClusterRestart() {
378379
logger.info("Start configured cluster using the script");
379380
executeLifecycleScript(START_CLUSTER_SCRIPT, CLUSTER_LIFECYCLE, CLUSTER_2);
380381
checkPodReadyAndServiceExists(configServerPodName,
381-
domainUid, domainNamespace);
382+
domainUid, domainNamespace);
382383
logger.info("Configured cluster restart success");
383384
}
384385

@@ -418,16 +419,16 @@ void testDynamicClusterRestart() {
418419

419420
// check managed server from other cluster are not affected
420421
Callable<Boolean> isCfgRestarted =
421-
assertDoesNotThrow(() -> isPodRestarted(configServerPodName,
422-
domainNamespace, cfgTs));
422+
assertDoesNotThrow(() -> isPodRestarted(configServerPodName,
423+
domainNamespace, cfgTs));
423424
assertFalse(assertDoesNotThrow(isCfgRestarted::call),
424425
"Configured managed server pod must not be restated");
425426

426427
// Verify clustered server are started after startCluster script execution
427428
logger.info("Start dynamic cluster using the script");
428429
executeLifecycleScript(START_CLUSTER_SCRIPT, CLUSTER_LIFECYCLE, CLUSTER_1);
429430
checkPodReadyAndServiceExists(dynamicServerPodName,
430-
domainUid, domainNamespace);
431+
domainUid, domainNamespace);
431432
logger.info("Dynamic cluster restart success");
432433
}
433434

@@ -487,8 +488,8 @@ void testDomainRestart() {
487488
logger.info("Domain is patched to start only administrative server");
488489

489490
checkPodReadyAndServiceExists(adminServerPodName,
490-
domainUid, domainNamespace);
491-
// make sure all other managed server pods are not provisioned
491+
domainUid, domainNamespace);
492+
// make sure all other managed server pods are not provisioned
492493
for (int i = 1; i <= replicaCount; i++) {
493494
checkPodDeleted(managedServerPrefix + i, domainUid, domainNamespace);
494495
}
@@ -511,7 +512,7 @@ void testDomainRestart() {
511512
// check dynamic managed server pods are ready
512513
for (int i = 1; i <= replicaCount; i++) {
513514
checkPodReadyAndServiceExists(managedServerPrefix + i,
514-
domainUid, domainNamespace);
515+
domainUid, domainNamespace);
515516
}
516517
checkPodReadyAndServiceExists(configServerPodName,
517518
domainUid, domainNamespace);
@@ -547,7 +548,7 @@ void testConfigClusterStartServerAlways() {
547548
"Failed to patch config managedServers's serverStartPolicy to ALWAYS");
548549
logger.info("Configured managed server is patched to set the serverStartPolicy to ALWAYS");
549550
checkPodReadyAndServiceExists(serverPodName,
550-
domainUid, domainNamespace);
551+
domainUid, domainNamespace);
551552
logger.info("Configured cluster managed server is RUNNING");
552553

553554
// Stop the server by changing the serverStartPolicy to IF_NEEDED
@@ -588,7 +589,7 @@ void testDynamicClusterStartServerAlways() {
588589
"Failed to patch dynamic managedServers's serverStartPolicy to ALWAYS");
589590
logger.info("Dynamic managed server is patched to set the serverStartPolicy to ALWAYS");
590591
checkPodReadyAndServiceExists(serverPodName,
591-
domainUid, domainNamespace);
592+
domainUid, domainNamespace);
592593
logger.info("Second managed server in dynamic cluster is RUNNING");
593594

594595
// Stop the server by changing the serverStartPolicy to IF_NEEDED
@@ -790,22 +791,22 @@ void testStandaloneManagedRestart() {
790791
logger.info("Configured managed server is RUNNING");
791792
// startServer.sh does not take any action on a running server
792793
String result = executeLifecycleScript(START_SERVER_SCRIPT,
793-
SERVER_LIFECYCLE, "standalone-managed",
794-
keepReplicaCountConstantParameter);
794+
SERVER_LIFECYCLE, "standalone-managed",
795+
keepReplicaCountConstantParameter);
795796
assertTrue(result.contains("No changes needed"), "startServer.sh shouldn't make changes");
796797

797798
// shutdown standalone-managed using the script stopServer.sh
798799
executeLifecycleScript(STOP_SERVER_SCRIPT, SERVER_LIFECYCLE,
799-
"standalone-managed", keepReplicaCountConstantParameter);
800+
"standalone-managed", keepReplicaCountConstantParameter);
800801
logger.info("Script executed to shutdown standalone managed server");
801802

802803
checkPodDeleted(serverPodName, domainUid, domainNamespace);
803804
logger.info("Standalone managed server shutdown success");
804805

805806
// stopServer.sh does not take any action on a stopped server
806807
result = executeLifecycleScript(STOP_SERVER_SCRIPT,
807-
SERVER_LIFECYCLE, "standalone-managed",
808-
keepReplicaCountConstantParameter);
808+
SERVER_LIFECYCLE, "standalone-managed",
809+
keepReplicaCountConstantParameter);
809810
assertTrue(result.contains("No changes needed"), "stopServer.sh shouldn't make changes");
810811

811812
executeLifecycleScript(START_SERVER_SCRIPT, SERVER_LIFECYCLE,
@@ -994,8 +995,8 @@ void testDynamicServerLifeCycleWithoutAdmin() {
994995

995996
// verify the script can stop the server by reducing replica count
996997
assertDoesNotThrow(() ->
997-
executeLifecycleScript(STOP_SERVER_SCRIPT,
998-
SERVER_LIFECYCLE, serverName, "", true),
998+
executeLifecycleScript(STOP_SERVER_SCRIPT,
999+
SERVER_LIFECYCLE, serverName, "", true),
9991000
String.format("Failed to run %s", STOP_SERVER_SCRIPT));
10001001
checkPodDeleted(serverPodName, domainUid, domainNamespace);
10011002
logger.info("Shutdown [" + serverName + "] without admin server success");
@@ -1077,8 +1078,8 @@ void testConfiguredServerLifeCycleWithoutAdmin() {
10771078

10781079
// verify the script can stop the server by reducing replica count
10791080
assertDoesNotThrow(() ->
1080-
executeLifecycleScript(STOP_SERVER_SCRIPT,
1081-
SERVER_LIFECYCLE, serverName, "", true),
1081+
executeLifecycleScript(STOP_SERVER_SCRIPT,
1082+
SERVER_LIFECYCLE, serverName, "", true),
10821083
String.format("Failed to run %s", STOP_SERVER_SCRIPT));
10831084
checkPodDeleted(serverPodName, domainUid, domainNamespace);
10841085
logger.info("Shutdown [" + serverName + "] without admin server success");
@@ -1432,12 +1433,9 @@ private void scalingClusters(String clusterName, String serverPodName, int repli
14321433
domainUid, domainNamespace, replicaNum)));
14331434

14341435
// use clusterStatus.sh to verify scaling results
1435-
result = assertDoesNotThrow(() ->
1436-
executeLifecycleScript(STATUS_CLUSTER_SCRIPT, CLUSTER_LIFECYCLE, clusterName),
1437-
String.format("Failed to run %s", STATUS_CLUSTER_SCRIPT));
1436+
testUntil(checkClusterStatus(clusterName, regex), logger,
1437+
"Checking for cluster status for cluster: " + clusterName);
14381438

1439-
assertTrue(verifyExecuteResult(result, regex), "The script should scale the given cluster: " + clusterName
1440-
+ ", the result is -> " + result + " . It doesn't match the expected pattern -> " + regex);
14411439
logger.info("The cluster {0} scaled successfully.", clusterName);
14421440
}
14431441

@@ -1646,4 +1644,13 @@ private boolean verifyExecuteResult(String result, String regex) {
16461644

16471645
return matcher.find();
16481646
}
1647+
1648+
private Callable<Boolean> checkClusterStatus(String clusterName, String regex) {
1649+
// use clusterStatus.sh to verify scaling results
1650+
String result = assertDoesNotThrow(() ->
1651+
executeLifecycleScript(STATUS_CLUSTER_SCRIPT, CLUSTER_LIFECYCLE, clusterName),
1652+
String.format("Failed to run %s", STATUS_CLUSTER_SCRIPT));
1653+
logger.info("Status of cluster {0} retured {1}, expected {2}", clusterName, result, regex);
1654+
return () -> verifyExecuteResult(result, regex);
1655+
}
16491656
}

0 commit comments

Comments
 (0)