Log message when replicas exceeds cluster count

Author: CarolynRountree

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

@@ -145,4 +145,5 @@ private MessageKeys() {}
   public static final String CANNOT_PARSE_INTROSPECTOR_RESULT = "WLSKO-0142";
   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 REPLICAS_EXCEEDS_TOTAL_CLUSTER_SERVER_COUNT = "WLSKO-0145";
 }

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;
@@ -60,18 +61,16 @@ void addServerIfNeeded(@Nonnull WlsServerConfig serverConfig, WlsClusterConfig c
         servers.add(serverName);
         addStartupInfo(new ServerStartupInfo(serverConfig, clusterName, server));
         addToCluster(clusterName);
-      } else {
-        logIfReplicaExceeds(clusterConfig);
       }
     }
 
     boolean exceedsMaxConfiguredClusterSize(WlsClusterConfig clusterConfig) {
       if (clusterConfig != null) {
         String clusterName = clusterConfig.getClusterName();
-        int configClusterSize = clusterConfig.getMaxDynamicClusterSize();
+        int configMaxClusterSize = clusterConfig.getMaxDynamicClusterSize();
         return clusterConfig.hasDynamicServers()
-            && getReplicaCount(clusterName) == configClusterSize
-            && domain.getReplicaCount(clusterName) > configClusterSize;
+            && clusterConfig.getServerConfigs().size() == configMaxClusterSize
+            && domain.getReplicaCount(clusterName) > configMaxClusterSize;
       }
       return false;
     }
@@ -98,14 +97,14 @@ private Integer getReplicaCount(String clusterName) {
       return Optional.ofNullable(replicas.get(clusterName)).orElse(0);
     }
 
-    private void logIfReplicaExceeds(WlsClusterConfig clusterConfig) {
+    private void logIfReplicasExceedsClusterServersMax(WlsClusterConfig clusterConfig) {
       if (exceedsMaxConfiguredClusterSize(clusterConfig)) {
         String clusterName = clusterConfig.getClusterName();
         LOGGER.warning(
-            "******* The replica count {1} exceeds the configured maximum dynamic cluster size {2} for cluster {0}",
-            clusterName,
+            MessageKeys.REPLICAS_EXCEEDS_TOTAL_CLUSTER_SERVER_COUNT,
             domain.getReplicaCount(clusterName),
-            clusterConfig.getMaxDynamicClusterSize());
+            clusterConfig.getMaxDynamicClusterSize(),
+            clusterName);
       }
     }
   }
@@ -129,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

@@ -142,4 +142,5 @@ WLSKO-0140=Job {0} is completed with status: {1}
 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-0144=Unable to start domain with domainUID {0} in namespace {1} after {2} attempts due to exception: {3}
+WLSKO-0145=Replica request of {0} exceeds the maximum dynamic server count + server count of {1} configured for cluster {2}