Add unit tests for ServerStatusReader

Author: russgold

operator/src/main/java/oracle/kubernetes/operator/PodWatcher.java

@@ -1,4 +1,4 @@
-// Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -117,10 +117,12 @@ static boolean isTerminating(V1Pod pod) {
   }
 
   static boolean isReady(V1Pod pod) {
-    return isReady(pod, false);
+    boolean ready = getReadyStatus(pod);
+    if (ready) LOGGER.info(MessageKeys.POD_IS_READY, pod.getMetadata().getName());
+    return ready;
   }
 
-  static boolean isReady(V1Pod pod, boolean isStatusCheck) {
+  static boolean getReadyStatus(V1Pod pod) {
     V1PodStatus status = pod.getStatus();
     if (status != null) {
       if ("Running".equals(status.getPhase())) {
@@ -129,10 +131,6 @@ static boolean isReady(V1Pod pod, boolean isStatusCheck) {
           for (V1PodCondition cond : conds) {
             if ("Ready".equals(cond.getType())) {
               if ("True".equals(cond.getStatus())) {
-                // Pod is Ready!
-                if (!isStatusCheck) {
-                  LOGGER.info(MessageKeys.POD_IS_READY, pod.getMetadata().getName());
-                }
                 return true;
               }
             }

operator/src/main/java/oracle/kubernetes/operator/ServerStatusReader.java

@@ -1,14 +1,15 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator;
 
+import static oracle.kubernetes.operator.KubernetesConstants.CONTAINER_NAME;
+
 import com.google.common.base.Charsets;
 import com.google.common.io.CharStreams;
 import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.ApiException;
-import io.kubernetes.client.Exec;
 import io.kubernetes.client.models.V1Pod;
 import java.io.IOException;
 import java.io.InputStream;
@@ -20,13 +21,17 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import oracle.kubernetes.operator.helpers.ClientPool;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.helpers.ServerKubernetesObjects;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.logging.MessageKeys;
 import oracle.kubernetes.operator.steps.ReadHealthStep;
+import oracle.kubernetes.operator.utils.KubernetesExec;
+import oracle.kubernetes.operator.utils.KubernetesExecFactory;
+import oracle.kubernetes.operator.utils.KubernetesExecFactoryImpl;
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
@@ -35,10 +40,12 @@
 /** Creates an asynchronous step to read the WebLogic server state from a particular pod */
 public class ServerStatusReader {
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
+  private static KubernetesExecFactory EXEC_FACTORY = new KubernetesExecFactoryImpl();
+  private static Function<Step, Step> STEP_FACTORY = ReadHealthStep::createReadHealthStep;
 
   private ServerStatusReader() {}
 
-  public static Step createDomainStatusReaderStep(
+  static Step createDomainStatusReaderStep(
       DomainPresenceInfo info, long timeoutSeconds, Step next) {
     return new DomainStatusReaderStep(info, timeoutSeconds, next);
   }
@@ -47,7 +54,7 @@ private static class DomainStatusReaderStep extends Step {
     private final DomainPresenceInfo info;
     private final long timeoutSeconds;
 
-    public DomainStatusReaderStep(DomainPresenceInfo info, long timeoutSeconds, Step next) {
+    DomainStatusReaderStep(DomainPresenceInfo info, long timeoutSeconds, Step next) {
       super(next);
       this.info = info;
       this.timeoutSeconds = timeoutSeconds;
@@ -65,13 +72,13 @@ public NextAction apply(Packet packet) {
       for (Map.Entry<String, ServerKubernetesObjects> entry : info.getServers().entrySet()) {
         String serverName = entry.getKey();
         ServerKubernetesObjects sko = entry.getValue();
-        if (sko != null) {
+        if (sko != null) { // !! Impossible to have a null value in a concurrent map
           V1Pod pod = sko.getPod().get();
           if (pod != null) {
             Packet p = packet.clone();
             startDetails.add(
                 new StepAndPacket(
-                    createServerStatusReaderStep(sko, pod, serverName, timeoutSeconds, null), p));
+                    createServerStatusReaderStep(sko, pod, serverName, timeoutSeconds), p));
           }
         }
       }
@@ -90,13 +97,12 @@ public NextAction apply(Packet packet) {
    * @param pod The pod
    * @param serverName Server name
    * @param timeoutSeconds Timeout in seconds
-   * @param next Next step
    * @return Created step
    */
-  public static Step createServerStatusReaderStep(
-      ServerKubernetesObjects sko, V1Pod pod, String serverName, long timeoutSeconds, Step next) {
+  private static Step createServerStatusReaderStep(
+      ServerKubernetesObjects sko, V1Pod pod, String serverName, long timeoutSeconds) {
     return new ServerStatusReaderStep(
-        sko, pod, serverName, timeoutSeconds, new ServerHealthStep(serverName, next));
+        sko, pod, serverName, timeoutSeconds, new ServerHealthStep(serverName, null));
   }
 
   private static class ServerStatusReaderStep extends Step {
@@ -105,7 +111,7 @@ private static class ServerStatusReaderStep extends Step {
     private final String serverName;
     private final long timeoutSeconds;
 
-    public ServerStatusReaderStep(
+    ServerStatusReaderStep(
         ServerKubernetesObjects sko, V1Pod pod, String serverName, long timeoutSeconds, Step next) {
       super(next);
       this.sko = sko;
@@ -120,7 +126,7 @@ public NextAction apply(Packet packet) {
       ConcurrentMap<String, String> serverStateMap =
           (ConcurrentMap<String, String>) packet.get(ProcessingConstants.SERVER_STATE_MAP);
 
-      if (PodWatcher.isReady(pod, true)) {
+      if (PodWatcher.getReadyStatus(pod)) {
         sko.getLastKnownStatus().set(WebLogicConstants.RUNNING_STATE);
         serverStateMap.put(serverName, WebLogicConstants.RUNNING_STATE);
         return doNext(packet);
@@ -145,14 +151,10 @@ public NextAction apply(Packet packet) {
             ClientPool helper = ClientPool.getInstance();
             ApiClient client = helper.take();
             try {
-              proc =
-                  new Exec(client)
-                      .exec(
-                          pod,
-                          new String[] {"/weblogic-operator/scripts/readState.sh"},
-                          KubernetesConstants.CONTAINER_NAME,
-                          stdin,
-                          tty);
+              KubernetesExec kubernetesExec = EXEC_FACTORY.create(client, pod, CONTAINER_NAME);
+              kubernetesExec.setStdin(stdin);
+              kubernetesExec.setTty(tty);
+              proc = kubernetesExec.exec("/weblogic-operator/scripts/readState.sh");
 
               InputStream in = proc.getInputStream();
               if (proc.waitFor(timeoutSeconds, TimeUnit.SECONDS)) {
@@ -179,7 +181,7 @@ public NextAction apply(Packet packet) {
   private static class ServerHealthStep extends Step {
     private final String serverName;
 
-    public ServerHealthStep(String serverName, Step next) {
+    ServerHealthStep(String serverName, Step next) {
       super(next);
       this.serverName = serverName;
     }
@@ -193,7 +195,7 @@ public NextAction apply(Packet packet) {
 
       if (WebLogicConstants.STATES_SUPPORTING_REST.contains(state)) {
         packet.put(ProcessingConstants.SERVER_NAME, serverName);
-        return doNext(ReadHealthStep.createReadHealthStep(getNext()), packet);
+        return doNext(STEP_FACTORY.apply(getNext()), packet);
       }
 
       return doNext(packet);