Merge pull request #729 from oracle/develop-OWLS-70567

Develop owls 70567

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/logging/MessageKeys.java

@@ -146,4 +146,5 @@ private MessageKeys() {}
   public static final String CANNOT_PARSE_INTROSPECTOR_FILE = "WLSKO-0143";
   public static final String CANNOT_START_DOMAIN_AFTER_MAX_RETRIES = "WLSKO-0144";
   public static final String CYCLING_POD = "WLSKO-0145";
+  public static final String REPLICAS_EXCEEDS_TOTAL_CLUSTER_SERVER_COUNT = "WLSKO-0146";
 }

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

@@ -13,6 +13,7 @@
 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.wlsconfig.WlsClusterConfig;
 import oracle.kubernetes.operator.wlsconfig.WlsDomainConfig;
 import oracle.kubernetes.operator.wlsconfig.WlsServerConfig;
@@ -63,6 +64,17 @@ void addServerIfNeeded(@Nonnull WlsServerConfig serverConfig, WlsClusterConfig c
       }
     }
 
+    boolean exceedsMaxConfiguredClusterSize(WlsClusterConfig clusterConfig) {
+      if (clusterConfig != null) {
+        String clusterName = clusterConfig.getClusterName();
+        int configMaxClusterSize = clusterConfig.getMaxDynamicClusterSize();
+        return clusterConfig.hasDynamicServers()
+            && clusterConfig.getServerConfigs().size() == configMaxClusterSize
+            && domain.getReplicaCount(clusterName) > configMaxClusterSize;
+      }
+      return false;
+    }
+
     private Step createNextStep(Step next) {
       if (servers.isEmpty()) return next;
       else return new ManagedServerUpIteratorStep(getStartupInfos(), next);
@@ -84,6 +96,17 @@ private void addToCluster(String clusterName) {
     private Integer getReplicaCount(String clusterName) {
       return Optional.ofNullable(replicas.get(clusterName)).orElse(0);
     }
+
+    private void logIfReplicasExceedsClusterServersMax(WlsClusterConfig clusterConfig) {
+      if (exceedsMaxConfiguredClusterSize(clusterConfig)) {
+        String clusterName = clusterConfig.getClusterName();
+        LOGGER.warning(
+            MessageKeys.REPLICAS_EXCEEDS_TOTAL_CLUSTER_SERVER_COUNT,
+            domain.getReplicaCount(clusterName),
+            clusterConfig.getMaxDynamicClusterSize(),
+            clusterName);
+      }
+    }
   }
 
   public ManagedServersUpStep(Step next) {
@@ -105,6 +128,7 @@ public NextAction apply(Packet packet) {
     Set<String> clusteredServers = new HashSet<>();
 
     for (WlsClusterConfig clusterConfig : config.getClusterConfigs().values()) {
+      factory.logIfReplicasExceedsClusterServersMax(clusterConfig);
       for (WlsServerConfig serverConfig : clusterConfig.getServerConfigs()) {
         factory.addServerIfNeeded(serverConfig, clusterConfig);
         clusteredServers.add(serverConfig.getName());

operator/src/main/resources/Operator.properties

@@ -143,4 +143,5 @@ WLSKO-0141=Failed to parse WebLogic Domain topology due to exception: {0}
 WLSKO-0142=Failed to parse results from domain introspector for domain {0} due to exception: {1}
 WLSKO-0143=Failed to parse file {0} from domain introspector for domain {1} due to exception: {2}
 WLSKO-0144=Unable to start domain with domainUID {0} in namespace {1} after {2} attempts due to exception: {3}
-WLSKO-0145=Replacing pod {0} with {1}
+WLSKO-0145=Replacing pod {0} with {1}
+WLSKO-0146=Replica request of {0} exceeds the maximum dynamic server count + server count of {1} configured for cluster {2}