Backport cluster member sorting fix

Author: rjeberhard

integration-tests/src/test/resources/setupenv.sh

@@ -22,6 +22,10 @@ function create_image_pull_secret_wl {
 
  if [ -z "$OCR_USERNAME" ] || [ -z "$OCR_PASSWORD" ]; then
  echo "Provide Docker login details using env variables OCR_USERNAME and OCR_PASSWORD to pull the WebLogic image."
+ echo "Alternatively, if this is a local run:"
+ echo " - 'export LOCAL_RUN=true' and:"
+ echo " - 'docker login' to the registry for '$IMAGE_NAME_WEBLOGIC' (if you haven't already done so)"
+ echo " and/or manually 'docker pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC'"
  exit 1
  fi
 

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

@@ -125,6 +125,9 @@ private void addServersToFactory(@Nonnull ServersUpStepFactory factory, @Nonnull
  private void addClusteredServersToFactory(@Nonnull ServersUpStepFactory factory, Set<String> clusteredServers,
  @Nonnull WlsClusterConfig wlsClusterConfig) {
  factory.logIfInvalidReplicaCount(wlsClusterConfig);
+ // We depend on 'getServerConfigs()' returning an ascending 'numero-lexi'
+ // sorted list so that a cluster's "lowest named" servers have precedence
+ // when the cluster's replica count is lower than the WL cluster size.
  wlsClusterConfig.getServerConfigs()
  .forEach(wlsServerConfig -> {
  factory.addServerIfNeeded(wlsServerConfig, wlsClusterConfig);

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

@@ -4,9 +4,12 @@
 package oracle.kubernetes.operator.wlsconfig;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
+import oracle.kubernetes.utils.OperatorUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -222,21 +225,24 @@ public void setWlsDomainConfig(WlsDomainConfig wlsDomainConfig) {
  }
 
  /**
- * Returns a list of server configurations for servers that belong to this cluster, which includes
- * both statically configured servers and dynamic servers.
+ * Returns a sorted list of server configurations for servers that belong to this cluster,
+ * which includes both statically configured servers and dynamic servers.
  *
- * @return A list of WlsServerConfig containing configurations of servers that belong to this
- * cluster
+ * @return A sorted list of WlsServerConfig containing configurations of servers that belong to
+ * this cluster
  */
  public synchronized List<WlsServerConfig> getServerConfigs() {
+ int dcsize = dynamicServersConfig == null ? 0 : dynamicServersConfig.getDynamicClusterSize();
+ List<WlsServerConfig> result = new ArrayList<>(dcsize + servers.size());
  if (dynamicServersConfig != null) {
- List<WlsServerConfig> result =
- new ArrayList<>(dynamicServersConfig.getDynamicClusterSize() + servers.size());
  result.addAll(dynamicServersConfig.getServerConfigs());
- result.addAll(servers);
- return result;
  }
- return servers;
+ result.addAll(servers);
+ Collections.sort(
+ result,
+ Comparator.comparing((WlsServerConfig sc) -> OperatorUtils.getSortingString(sc.getName()))
+ );
+ return result;
  }
 
  public List<WlsServerConfig> getServers() {
@@ -405,4 +411,4 @@ public boolean equals(Object other) {
  return builder.isEquals();
  }
 
-}
+}

pom.xml

@@ -699,7 +699,8 @@
  <maven-pmd-plugin-version>3.13.0</maven-pmd-plugin-version>
  <maven-release-plugin-version>3.0.0-M1</maven-release-plugin-version>
  <maven-javadoc-plugin-version>3.1.1</maven-javadoc-plugin-version>
- <maven-failsafe-plugin-version>3.0.0-M4</maven-failsafe-plugin-version>
+ <!-- do NOT use the 3.0.0-M4 failsafe-plugin (ignores @BeforeAll failures) -->
+ <maven-failsafe-plugin-version>3.0.0-M3</maven-failsafe-plugin-version>
  <maven-dependency-plugin-version>3.1.1</maven-dependency-plugin-version>
  <exec-maven-plugin-version>1.6.0</exec-maven-plugin-version>
  <spotbugs-maven-plugin-version>3.1.12.2</spotbugs-maven-plugin-version>