OWLS-81272 - Fix domain status for 'desired state' (#1613)

* maintain ordering in servers and clusters in setters

* update ServerStatus desiredState description

* desiredStatus value also depends on ServerStartupInfos. Add update status call to ManagedServerUpIteratorStep.

* remove local variable from getDesiredState

* minor cleanup

* server status for configured cluster

* fix bug where health of configured servers in cluster is not read

* add ReadHealthStep tests for dynamic servers and configured servers

* remove getServerConfig(String) that is no longer used

Author: alai8

docs/domains/Domain.json

@@ -725,7 +725,7 @@
           "type": "string"
         },
         "desiredState": {
-          "description": "Desired state of this WebLogic Server.",
+          "description": "Desired state of this WebLogic Server. Values are RUNNING, ADMIN, or SHUTDOWN.",
           "type": "string"
         },
         "clusterName": {

docs/domains/Domain.md

@@ -181,7 +181,7 @@ ServerPod describes the configuration for a Kubernetes pod for a server.
 | Name | Type | Description |
 | --- | --- | --- |
 | `clusterName` | string | WebLogic cluster name, if the server is part of a cluster. |
-| `desiredState` | string | Desired state of this WebLogic Server. |
+| `desiredState` | string | Desired state of this WebLogic Server. Values are RUNNING, ADMIN, or SHUTDOWN. |
 | `health` | [Server Health](#server-health) | Current status and health of a specific WebLogic Server. |
 | `nodeName` | string | Name of node that is hosting the Pod containing this WebLogic Server. |
 | `serverName` | string | WebLogic Server name. Required. |

docs/domains/index.html

@@ -1645,7 +1645,7 @@
           "type": "string"
         },
         "desiredState": {
-          "description": "Desired state of this WebLogic Server.",
+          "description": "Desired state of this WebLogic Server. Values are RUNNING, ADMIN, or SHUTDOWN.",
           "type": "string"
         },
         "clusterName": {

kubernetes/crd/domain-crd.yaml

@@ -21131,7 +21131,8 @@ spec:
                         this WebLogic Server.
                       type: string
                     desiredState:
-                      description: Desired state of this WebLogic Server.
+                      description: Desired state of this WebLogic Server. Values are
+                        RUNNING, ADMIN, or SHUTDOWN.
                       type: string
                     clusterName:
                       description: WebLogic cluster name, if the server is part of

kubernetes/crd/domain-v1beta1-crd.yaml

@@ -20709,7 +20709,8 @@ spec:
                       WebLogic Server.
                     type: string
                   desiredState:
-                    description: Desired state of this WebLogic Server.
+                    description: Desired state of this WebLogic Server. Values are
+                      RUNNING, ADMIN, or SHUTDOWN.
                     type: string
                   clusterName:
                     description: WebLogic cluster name, if the server is part of a

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

@@ -78,7 +78,7 @@ private DomainStatusUpdater() {
    * @param next the next step
    * @return the new step
    */
-  static Step createStatusUpdateStep(Step next) {
+  public static Step createStatusUpdateStep(Step next) {
     return new StatusUpdateStep(next);
   }
 
@@ -399,27 +399,38 @@ private boolean hasReadyServerPod(String serverName) {
       Map<String, ServerStatus> getServerStatuses(final String adminServerName) {
         return getServerNames().stream()
             .collect(Collectors.toMap(Function.identity(),
-                s -> createServerStatus(s,adminServerName)));
+                s -> createServerStatus(s, Objects.equals(s, adminServerName))));
       }
 
-      private ServerStatus createServerStatus(String serverName, String adminServerName) {
+      private ServerStatus createServerStatus(String serverName, boolean isAdminServer) {
         String clusterName = getClusterName(serverName);
         return new ServerStatus()
             .withServerName(serverName)
             .withState(getRunningState(serverName))
-            .withDesiredState(getDesiredState(serverName, clusterName))
-            .withHealth(serverHealth.get(serverName))
+            .withDesiredState(getDesiredState(serverName, clusterName, isAdminServer))
+            .withHealth(serverHealth == null ? null : serverHealth.get(serverName))
             .withClusterName(clusterName)
             .withNodeName(getNodeName(serverName))
-            .withIsAdminServer(serverName.equals(adminServerName));
+            .withIsAdminServer(isAdminServer);
       }
 
       private String getRunningState(String serverName) {
-        return serverState.getOrDefault(serverName, SHUTDOWN_STATE);
+        if (serverState != null) {
+          return serverState.getOrDefault(serverName, SHUTDOWN_STATE);
+        }
+        return SHUTDOWN_STATE;
+      }
+
+      private String getDesiredState(String serverName, String clusterName, boolean isAdminServer) {
+        return isAdminServer | shouldStart(serverName)
+            ? getDomain().getServer(serverName, clusterName).getDesiredState()
+            : SHUTDOWN_STATE;
       }
 
-      private String getDesiredState(String serverName, String clusterName) {
-        return getDomain().getServer(serverName, clusterName).getDesiredState();
+      private boolean shouldStart(final String serverName) {
+        return getServerStartupInfos()
+            .filter(s -> Objects.equals(serverName, s.getServerName()))
+            .anyMatch(s -> !s.isServiceOnly());
       }
 
       Integer getReplicaSetting() {
@@ -494,6 +505,8 @@ private Collection<String> getServerNames() {
                   Optional.ofNullable(cluster.getDynamicServersConfig())
                         .flatMap(dynamicConfig -> Optional.ofNullable(dynamicConfig.getServerConfigs()))
                         .ifPresent(servers -> servers.forEach(item -> result.add(item.getName())));
+                  Optional.ofNullable(cluster.getServerConfigs())
+                      .ifPresent(servers -> servers.forEach(item -> result.add(item.getName())));
                 }
               });
         return result;

operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServerUpIteratorStep.java

@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import oracle.kubernetes.operator.DomainStatusUpdater;
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo.ServerStartupInfo;
@@ -88,6 +89,24 @@ public NextAction apply(Packet packet) {
     if (startDetails.isEmpty()) {
       return doNext(packet);
     }
-    return doForkJoin(new ManagedServerUpAfterStep(getNext()), packet, startDetails);
+    return doNext(
+        DomainStatusUpdater.createStatusUpdateStep(
+            new StartManagedServersStep(startDetails, getNext())),
+        packet);
   }
+
+  static class StartManagedServersStep extends Step {
+    final Collection<StepAndPacket> startDetails;
+
+    StartManagedServersStep(Collection<StepAndPacket> startDetails, Step next) {
+      super(next);
+      this.startDetails = startDetails;
+    }
+
+    @Override
+    public NextAction apply(Packet packet) {
+      return doForkJoin(new ManagedServerUpAfterStep(getNext()), packet, startDetails);
+    }
+  }
+
 }

operator/src/main/java/oracle/kubernetes/operator/steps/ReadHealthStep.java

@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -117,13 +118,14 @@ public NextAction apply(Packet packet) {
           domainConfig = scan.getWlsDomainConfig();
         }
         String serverName = (String) packet.get(ProcessingConstants.SERVER_NAME);
+        // standalone server that does not belong to any cluster
         WlsServerConfig serverConfig = domainConfig.getServerConfig(serverName);
 
         if (serverConfig == null) {
-          // dynamic server
+          // dynamic or configured server in a cluster
           String clusterName = service.getMetadata().getLabels().get(CLUSTERNAME_LABEL);
           WlsClusterConfig cluster = domainConfig.getClusterConfig(clusterName);
-          serverConfig = cluster.getDynamicServersConfig().getServerConfig(serverName);
+          serverConfig = findServerConfig(cluster, serverName);
         }
 
         if (httpClient == null) {
@@ -181,6 +183,16 @@ public NextAction apply(Packet packet) {
       }
     }
 
+
+    private WlsServerConfig findServerConfig(WlsClusterConfig wlsClusterConfig, String serverName) {
+      for (WlsServerConfig serverConfig: wlsClusterConfig.getServerConfigs()) {
+        if (Objects.equals(serverName, serverConfig.getName())) {
+          return serverConfig;
+        }
+      }
+      return null;
+    }
+
     private Pair<String, ServerHealth> createServerHealthFromResult(Result restResult)
         throws IOException {
       if (restResult.isSuccessful()) {

operator/src/main/java/oracle/kubernetes/operator/utils/WlsDomainConfigSupport.java

@@ -11,6 +11,7 @@
 
 import oracle.kubernetes.operator.wlsconfig.WlsClusterConfig;
 import oracle.kubernetes.operator.wlsconfig.WlsDomainConfig;
+import oracle.kubernetes.operator.wlsconfig.WlsDynamicServersConfig;
 import oracle.kubernetes.operator.wlsconfig.WlsMachineConfig;
 import oracle.kubernetes.operator.wlsconfig.WlsServerConfig;
 
@@ -35,6 +36,16 @@ public WlsDomainConfigSupport withWlsServer(String serverName, Integer listenPor
     return this;
   }
 
+  public WlsDomainConfigSupport withWlsCluster(String clusterName, String... serverNames) {
+    addWlsCluster(clusterName, serverNames);
+    return this;
+  }
+
+  public WlsDomainConfigSupport withDynamicWlsCluster(String clusterName, String... serverNames) {
+    addDynamicWlsCluster(clusterName, serverNames);
+    return this;
+  }
+
   public WlsDomainConfigSupport withAdminServerName(String adminServerName) {
     setAdminServerName(adminServerName);
     return this;
@@ -124,6 +135,20 @@ public WlsClusterConfig getWlsCluster(String clusterName) {
     return wlsClusters.get(clusterName);
   }
 
+  /**
+   * Adds a dynamic WLS cluster to the configuration, including its member servers.
+   *
+   * @param clusterName the name of the cluster
+   * @param serverNames the names of the servers
+   */
+  public void addDynamicWlsCluster(String clusterName, String... serverNames) {
+    ClusterConfigBuilder builder = new DynamicClusterConfigBuilder(clusterName);
+    for (String serverName : serverNames) {
+      builder.addServer(serverName);
+    }
+    wlsClusters.put(clusterName, builder.build());
+  }
+
   /**
    * Creates a domain configuration, based on the defined servers and clusters.
    *
@@ -172,6 +197,10 @@ static class ClusterConfigBuilder {
       this.name = name;
     }
 
+    String getName() {
+      return name;
+    }
+
     void addServer(String serverName) {
       addServer(serverName, null);
     }
@@ -188,4 +217,18 @@ WlsClusterConfig build() {
       return wlsClusterConfig;
     }
   }
+
+  static class DynamicClusterConfigBuilder extends ClusterConfigBuilder {
+    DynamicClusterConfigBuilder(String name) {
+      super(name);
+    }
+
+    WlsClusterConfig build() {
+      WlsDynamicServersConfig wlsDynamicServersConfig = new WlsDynamicServersConfig();
+      wlsDynamicServersConfig.setServerConfigs(serverConfigs);
+      wlsDynamicServersConfig.setDynamicClusterSize(serverConfigs.size());
+      WlsClusterConfig wlsClusterConfig = new WlsClusterConfig(getName(), wlsDynamicServersConfig);
+      return wlsClusterConfig;
+    }
+  }
 }

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsDynamicServersConfig.java

@@ -272,26 +272,6 @@ public void setServerConfigs(List<WlsServerConfig> serverConfigs) {
     this.serverConfigs = serverConfigs;
   }
 
-  /**
-   * Returns the configuration for the dynamic WLS server with the given name.
-   *
-   * @param serverName name of the WLS server
-   * @return The WlsServerConfig object containing configuration of the WLS server with the given
-   *     name. This methods return null if no WLS configuration is found for the given server name.
-   */
-  public synchronized WlsServerConfig getServerConfig(String serverName) {
-    WlsServerConfig result = null;
-    if (serverName != null && serverConfigs != null) {
-      for (WlsServerConfig serverConfig : serverConfigs) {
-        if (serverConfig.getName().equals(serverName)) {
-          result = serverConfig;
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
   /**
    * Return the server template associated with this dynamic servers configuration.
    *