Skip to content

Commit b2579ca

Browse files
sankarpnrjeberhard
authored andcommitted
Restart core-dns if DNS resolution fails
1 parent 8ae0d39 commit b2579ca

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
4444
import oracle.weblogic.kubernetes.annotations.Namespaces;
4545
import oracle.weblogic.kubernetes.logging.LoggingFacade;
46+
import oracle.weblogic.kubernetes.utils.ExecCommand;
4647
import oracle.weblogic.kubernetes.utils.ExecResult;
4748
import oracle.weblogic.kubernetes.utils.OracleHttpClient;
4849
import org.junit.jupiter.api.BeforeAll;
@@ -58,6 +59,7 @@
5859
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
5960
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
6061
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
62+
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
6163
import static oracle.weblogic.kubernetes.TestConstants.OKD;
6264
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
6365
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
@@ -93,6 +95,7 @@
9395
import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.installAndVerifyNginx;
9496
import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
9597
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
98+
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
9699
import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName;
97100
import static oracle.weblogic.kubernetes.utils.PodUtils.setPodAntiAffinity;
98101
import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
@@ -688,6 +691,22 @@ private static void createNginxIngressPathRoutingRules() {
688691

689692
String curlCmd = "curl -g --silent --show-error --noproxy '*' http://" + hostAndPort
690693
+ "/weblogic/ready --write-out %{http_code} -o /dev/null";
694+
if (OKE_CLUSTER) {
695+
try {
696+
if (!callWebAppAndWaitTillReady(curlCmd, 60)) {
697+
ExecResult result = ExecCommand.exec(KUBERNETES_CLI + " get all -A");
698+
logger.info(result.stdout());
699+
//restart core-dns service
700+
result = ExecCommand.exec(KUBERNETES_CLI + " rollout restart deployment coredns -n kube-system");
701+
logger.info(result.stdout());
702+
checkPodReady("core-dns", null, "kube-system");
703+
result = ExecCommand.exec(curlCmd);
704+
logger.info(result.stdout());
705+
}
706+
} catch (Exception ex) {
707+
logger.warning(ex.getLocalizedMessage());
708+
}
709+
}
691710

692711
logger.info("Executing curl command {0}", curlCmd);
693712
assertTrue(callWebAppAndWaitTillReady(curlCmd, 60));

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/ApplicationUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ public static boolean callWebAppAndWaitTillReturnedCode(String curlCmd, String h
382382
httpStatusCode, responseCode, i, maxIterations);
383383

384384
try {
385-
Thread.sleep(1000);
385+
Thread.sleep(5000);
386386
} catch (InterruptedException ignore) {
387387
// ignore
388388
}

0 commit comments

Comments
 (0)