Correct updates

rjeberhard · rjeberhard · commit 509a717bddca · 2019-07-16T13:02:03.000-04:00
diff --git a/docs/domains/Domain.json b/docs/domains/Domain.json
@@ -137,6 +137,11 @@
     "ClusterStatus": {
       "type": "object",
       "properties": {
+        "maximumReplicas": {
+          "description": "The maximum number of cluster members. Required.",
+          "type": "number",
+          "minimum": 0
+        },
         "replicas": {
           "description": "The number of intended cluster members. Required.",
           "type": "number",
@@ -240,7 +245,7 @@
           "type": "boolean"
         },
         "domainUID": {
-          "pattern": "^[a-z0-9_.]{1,253}$",
+          "pattern": "^[a-z0-9-.]{1,253}$",
           "description": "Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name.",
           "type": "string"
         },
diff --git a/docs/domains/Domain.md b/docs/domains/Domain.md
@@ -128,6 +128,7 @@ ServerPod describes the configuration for a Kubernetes pod for a server.
 | Name | Type | Description |
 | --- | --- | --- |
 | `clusterName` | string | WebLogic cluster name. Required. |
+| `maximumReplicas` | number | The maximum number of cluster members. Required. |
 | `readyReplicas` | number | The number of ready cluster members. Required. |
 | `replicas` | number | The number of intended cluster members. Required. |
 
diff --git a/docs/domains/index.html b/docs/domains/index.html
@@ -1057,6 +1057,11 @@
     "ClusterStatus": {
       "type": "object",
       "properties": {
+        "maximumReplicas": {
+          "description": "The maximum number of cluster members. Required.",
+          "type": "number",
+          "minimum": 0.0
+        },
         "replicas": {
           "description": "The number of intended cluster members. Required.",
           "type": "number",
@@ -1160,7 +1165,7 @@
           "type": "boolean"
         },
         "domainUID": {
-          "pattern": "^[a-z0-9_.]{1,253}$",
+          "pattern": "^[a-z0-9-.]{1,253}$",
           "description": "Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name.",
           "type": "string"
         },
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java b/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java
@@ -14,6 +14,7 @@
 import java.util.logging.SimpleFormatter;
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
+
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.ExecCommand;
 import oracle.kubernetes.operator.utils.ExecResult;
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItElasticLogging.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItElasticLogging.java
@@ -229,10 +229,10 @@ public void testWeblogicLogSearch() throws Exception {
 
     Map<String, Object> domainMap = domain.getDomainMap();
     String domainUid = domain.getDomainUid();
-    String adminServerName = (String) domainMap.get("adminServerName");
-    String adminServerPodName = domainUid + "-" + adminServerName;
-    String managedServerNameBase = domainMap.get("managedServerNameBase").toString();
-    String managedServerPodName = domainUid + "-" + managedServerNameBase + "1";
+    final String adminServerName = (String) domainMap.get("adminServerName");
+    final String adminServerPodName = domainUid + "-" + adminServerName;
+    final String managedServerNameBase = domainMap.get("managedServerNameBase").toString();
+    final String managedServerPodName = domainUid + "-" + managedServerNameBase + "1";
 
     // Wait 30 seconds for WLS log to be pushed to ELK Stack
     logger.info("Wait 30 seconds for WLS log to be pushed to ELK Stack");
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItMonitoringExporter.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItMonitoringExporter.java
@@ -4,17 +4,6 @@
 
 package oracle.kubernetes.operator;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlFileInput;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlRadioButtonInput;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -26,6 +15,14 @@
 import java.util.Map;
 import java.util.logging.Level;
 import javax.xml.bind.DatatypeConverter;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlFileInput;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlRadioButtonInput;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.ExecCommand;
 import oracle.kubernetes.operator.utils.ExecResult;
@@ -39,6 +36,10 @@
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /** This test is used for testing Monitoring Exporter with Operator(s) . */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ItMonitoringExporter extends BaseTest {
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java b/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java
@@ -29,6 +29,7 @@
 import javax.jms.QueueConnectionFactory;
 import javax.naming.Context;
 import javax.naming.InitialContext;
+
 import oracle.kubernetes.operator.BaseTest;
 import org.yaml.snakeyaml.Yaml;
 
@@ -902,17 +903,17 @@ protected void createPv() throws Exception {
     
     logger.info("pvSharing for this domain is: " + pvSharing);
     if (!pvSharing) {
-    	pvMap.put("domainUID", domainUid);
+      pvMap.put("domainUID", domainUid);
     } else {
-    	pvMap.put("baseName", "weblogic-sharing");
+      pvMap.put("baseName", "weblogic-sharing");
     }
     logger.info("baseName of PVPVC for this domain is: " + (String) pvMap.get("baseName"));
 
     // Now there is only one pvSharing test case and we just use parameter "baseName"+"-pvc" as PVC
     if ((domainUid != null) && !pvSharing) {
       domainMap.put("persistentVolumeClaimName", domainUid + "-" + pvMap.get("baseName") + "-pvc");
     } else {
-    	domainMap.put("persistentVolumeClaimName", pvMap.get("baseName") + "-pvc");
+      domainMap.put("persistentVolumeClaimName", pvMap.get("baseName") + "-pvc");
     }
 
     if (domainMap.get("weblogicDomainStorageReclaimPolicy") != null) {
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java b/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java
@@ -10,6 +10,7 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.logging.Logger;
+
 import oracle.kubernetes.operator.BaseTest;
 
 /** Operator class with all the utility methods for Operator. */
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java b/integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java
@@ -28,6 +28,7 @@
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+
 import oracle.kubernetes.operator.BaseTest;
 import oracle.kubernetes.operator.utils.Operator.RestCertType;
 import org.glassfish.jersey.jsonp.JsonProcessingFeature;
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ClusterStatus.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ClusterStatus.java
@@ -4,9 +4,6 @@
 
 package oracle.kubernetes.weblogic.domain.model;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import oracle.kubernetes.json.Description;
@@ -33,6 +30,11 @@ public class ClusterStatus implements Comparable<ClusterStatus> {
   @Range(minimum = 0)
   private Integer readyReplicas;
 
+  /** The maximum number of cluster members. Required. */
+  @Description("The maximum number of cluster members. Required.")
+  @Range(minimum = 0)
+  private Integer maximumReplicas;
+
   /**
    * WebLogic cluster name. Required.
    *
@@ -88,12 +90,26 @@ public ClusterStatus withReadyReplicas(Integer readyReplicas) {
     return this;
   }
 
+  public Integer getMaximumReplicas() {
+    return maximumReplicas;
+  }
+
+  public void setMaximumReplicas(Integer maximumReplicas) {
+    this.maximumReplicas = maximumReplicas;
+  }
+
+  public ClusterStatus withMaximumReplicas(Integer maximumReplicas) {
+    this.maximumReplicas = maximumReplicas;
+    return this;
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this)
         .append("clusterName", clusterName)
         .append("replicas", replicas)
         .append("readyReplicas", readyReplicas)
+        .append("maximumReplicas", maximumReplicas)
         .toString();
   }
 
@@ -103,6 +119,7 @@ public int hashCode() {
         .append(clusterName)
         .append(replicas)
         .append(readyReplicas)
+        .append(maximumReplicas)
         .toHashCode();
   }
 
@@ -119,6 +136,7 @@ public boolean equals(Object other) {
         .append(clusterName, rhs.clusterName)
         .append(replicas, rhs.replicas)
         .append(readyReplicas, rhs.readyReplicas)
+        .append(maximumReplicas, rhs.maximumReplicas)
         .isEquals();
   }
 
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainSpec.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainSpec.java
@@ -44,7 +44,7 @@ public class DomainSpec extends BaseConfiguration {
   @Description(
       "Domain unique identifier. Must be unique across the Kubernetes cluster. Not required."
           + " Defaults to the value of metadata.name.")
-  @Pattern("^[a-z0-9_.]{1,253}$")
+  @Pattern("^[a-z0-9-.]{1,253}$")
   @SerializedName("domainUID")
   private String domainUid;
   /**
diff --git a/operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java b/operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java
@@ -341,56 +341,51 @@ public void dispatchDomainWatch(Watch.Response<Domain> item) {
 
   private void scheduleDomainStatusUpdating(DomainPresenceInfo info) {
     final OncePerMessageLoggingFilter loggingFilter = new OncePerMessageLoggingFilter();
-    Runnable command =
-        new Runnable() {
-          public void run() {
-            try {
-              Runnable r = this; // resolve visibility
-              Packet packet = new Packet();
-              packet
-                  .getComponents()
-                  .put(
-                      ProcessingConstants.DOMAIN_COMPONENT_NAME,
-                      Component.createFor(info, delegate.getVersion()));
-              packet.put(LoggingFilter.LOGGING_FILTER_PACKET_KEY, loggingFilter);
-              MainTuning main = TuningParameters.getInstance().getMainTuning();
-              Step strategy =
-                  DomainStatusUpdater.createStatusStep(main.statusUpdateTimeoutSeconds, null);
-              FiberGate gate = getStatusFiberGate(info.getNamespace());
-              gate.startFiberIfNoCurrentFiber(
-                  info.getDomainUid(),
-                  strategy,
-                  packet,
-                  new CompletionCallback() {
-                    @Override
-                    public void onCompletion(Packet packet) {
-                      AtomicInteger serverHealthRead =
-                          packet.getValue(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ);
-                      if (serverHealthRead == null || serverHealthRead.get() == 0) {
-                        loggingFilter.setFiltering(false).resetLogHistory();
-                      } else {
-                        loggingFilter.setFiltering(true);
-                      }
-                    }
-
-                    @Override
-                    public void onThrowable(Packet packet, Throwable throwable) {
-                      LOGGER.severe(MessageKeys.EXCEPTION, throwable);
-                      loggingFilter.setFiltering(true);
-                    }
-                  });
-            } catch (Throwable t) {
-              LOGGER.severe(MessageKeys.EXCEPTION, t);
-            }
-          }
-        };
 
     MainTuning main = TuningParameters.getInstance().getMainTuning();
     registerStatusUpdater(
         info.getNamespace(),
         info.getDomainUid(),
         delegate.scheduleWithFixedDelay(
-            command, main.initialShortDelay, main.initialShortDelay, TimeUnit.SECONDS));
+            () -> {
+              try {
+                Packet packet = new Packet();
+                packet
+                    .getComponents()
+                    .put(
+                        ProcessingConstants.DOMAIN_COMPONENT_NAME,
+                        Component.createFor(info, delegate.getVersion()));
+                packet.put(LoggingFilter.LOGGING_FILTER_PACKET_KEY, loggingFilter);
+                Step strategy =
+                    DomainStatusUpdater.createStatusStep(main.statusUpdateTimeoutSeconds, null);
+                FiberGate gate = getStatusFiberGate(info.getNamespace());
+
+                Fiber f = gate.startFiberIfNoCurrentFiber(
+                    info.getDomainUid(),
+                    strategy,
+                    packet,
+                    new CompletionCallback() {
+                      @Override
+                      public void onCompletion(Packet packet) {
+                        AtomicInteger serverHealthRead =
+                            packet.getValue(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ);
+                        if (serverHealthRead == null || serverHealthRead.get() == 0) {
+                          loggingFilter.setFiltering(false).resetLogHistory();
+                        } else {
+                          loggingFilter.setFiltering(true);
+                        }
+                      }
+
+                      @Override
+                      public void onThrowable(Packet packet, Throwable throwable) {
+                        LOGGER.severe(MessageKeys.EXCEPTION, throwable);
+                        loggingFilter.setFiltering(true);
+                      }
+                    });
+              } catch (Throwable t) {
+                LOGGER.severe(MessageKeys.EXCEPTION, t);
+              }
+            }, main.initialShortDelay, main.initialShortDelay, TimeUnit.SECONDS));
   }
 
   public void makeRightDomainPresence(
diff --git a/operator/src/main/java/oracle/kubernetes/operator/DomainStatusUpdater.java b/operator/src/main/java/oracle/kubernetes/operator/DomainStatusUpdater.java
@@ -29,6 +29,7 @@
 import oracle.kubernetes.operator.rest.Scan;
 import oracle.kubernetes.operator.rest.ScanCache;
 import oracle.kubernetes.operator.steps.DefaultResponseStep;
+import oracle.kubernetes.operator.wlsconfig.WlsClusterConfig;
 import oracle.kubernetes.operator.wlsconfig.WlsDomainConfig;
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
@@ -368,7 +369,8 @@ private ClusterStatus createClusterStatus(String clusterName) {
             .withClusterName(clusterName)
             .withReplicas(Optional.ofNullable(getClusterCounts().get(clusterName)).map(Long::intValue).orElse(null))
             .withReadyReplicas(
-                Optional.ofNullable(getClusterCounts(true).get(clusterName)).map(Long::intValue).orElse(null));
+                Optional.ofNullable(getClusterCounts(true).get(clusterName)).map(Long::intValue).orElse(null))
+            .withMaximumReplicas(getClusterMaximumSize(clusterName));
       }
 
 
@@ -392,7 +394,14 @@ private String getClusterNameFromPod(String serverName) {
 
       private Collection<String> getServerNames() {
         Set<String> result = new HashSet<>();
-        getDomainConfig().stream().forEach(config -> result.addAll(config.getServerConfigs().keySet()));
+        getDomainConfig().stream().forEach(config -> {
+          result.addAll(config.getServerConfigs().keySet());
+          for (WlsClusterConfig cluster : config.getConfiguredClusters()) {
+            Optional.ofNullable(cluster.getDynamicServersConfig())
+                .ifPresent(dynamicConfig -> Optional.ofNullable(dynamicConfig.getServerConfigs())
+                    .ifPresent(servers -> servers.stream().forEach(item -> result.add(item.getName()))));
+          }
+        });
         return result;
       }
 
@@ -401,6 +410,11 @@ private Collection<String> getClusterNames() {
         getDomainConfig().stream().forEach(config -> result.addAll(config.getClusterConfigs().keySet()));
         return result;
       }
+
+      private Integer getClusterMaximumSize(String clusterName) {
+        return getDomainConfig().map(config -> Optional.ofNullable(config.getClusterConfig(clusterName)))
+            .map(cluster -> cluster.map(c -> c.getMaxClusterSize()).orElse(0)).get();
+      }
     }
   }
 
