Merge pull request #534 from oracle/owls-70348_handleNamedUnclusteredServers

Handle named servers according to their cluster association

Author: rjeberhard

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

@@ -4,13 +4,7 @@
 
 package oracle.kubernetes.operator.steps;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import javax.annotation.Nonnull;
 import oracle.kubernetes.operator.DomainStatusUpdater;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
@@ -100,16 +94,20 @@ public NextAction apply(Packet packet) {
       LOGGER.fine(SERVERS_UP_MSG, factory.domain.getDomainUID(), getRunningServers(info));
     }
 
-    for (WlsServerConfig serverConfig : info.getScan().getServerConfigs().values()) {
-      factory.addServerIfNeeded(serverConfig, null);
-    }
+    Set<String> clusteredServers = new HashSet<>();
 
     for (WlsClusterConfig clusterConfig : info.getScan().getClusterConfigs().values()) {
       for (WlsServerConfig serverConfig : clusterConfig.getServerConfigs()) {
         factory.addServerIfNeeded(serverConfig, clusterConfig);
+        clusteredServers.add(serverConfig.getName());
       }
     }
 
+    for (WlsServerConfig serverConfig : info.getScan().getServerConfigs().values()) {
+      if (!clusteredServers.contains(serverConfig.getName()))
+        factory.addServerIfNeeded(serverConfig, null);
+    }
+
     info.setServerStartupInfo(factory.getStartupInfos());
     LOGGER.exiting();
     return doNext(

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

@@ -6,6 +6,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /** Contains configuration of a WLS server that belongs to a dynamic cluster */
 public class WlsDynamicServerConfig extends WlsServerConfig {
@@ -118,24 +119,6 @@ public boolean isDynamicServer() {
 
   @Override
   public String toString() {
-    return "WlsDynamicServerConfig{"
-        + "name='"
-        + name
-        + '\''
-        + ", listenPort="
-        + listenPort
-        + ", listenAddress='"
-        + listenAddress
-        + '\''
-        + ", sslListenPort="
-        + sslListenPort
-        + ", sslPortEnabled="
-        + sslPortEnabled
-        + ", machineName='"
-        + machineName
-        + '\''
-        + ", networkAccessPoints="
-        + networkAccessPoints
-        + '}';
+    return new ToStringBuilder(this).toString();
   }
 }

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

@@ -7,6 +7,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /** Contains configuration of a WebLogic server */
 public class WlsServerConfig {
@@ -256,26 +259,48 @@ private static String getSSLSearchFields() {
     return "'enabled', 'listenPort'";
   }
 
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+
+    if (o == null || getClass() != o.getClass()) return false;
+
+    WlsServerConfig that = (WlsServerConfig) o;
+
+    return new EqualsBuilder()
+        .append(sslPortEnabled, that.sslPortEnabled)
+        .append(name, that.name)
+        .append(listenPort, that.listenPort)
+        .append(listenAddress, that.listenAddress)
+        .append(sslListenPort, that.sslListenPort)
+        .append(machineName, that.machineName)
+        .append(networkAccessPoints, that.networkAccessPoints)
+        .isEquals();
+  }
+
+  @Override
+  public int hashCode() {
+    return new HashCodeBuilder(17, 37)
+        .append(name)
+        .append(listenPort)
+        .append(listenAddress)
+        .append(sslListenPort)
+        .append(sslPortEnabled)
+        .append(machineName)
+        .append(networkAccessPoints)
+        .toHashCode();
+  }
+
   @Override
   public String toString() {
-    return "WlsServerConfig{"
-        + "name='"
-        + name
-        + '\''
-        + ", listenPort="
-        + listenPort
-        + ", listenAddress='"
-        + listenAddress
-        + '\''
-        + ", sslListenPort="
-        + sslListenPort
-        + ", sslPortEnabled="
-        + sslPortEnabled
-        + ", machineName='"
-        + machineName
-        + '\''
-        + ", networkAccessPoints="
-        + networkAccessPoints
-        + '}';
+    return new ToStringBuilder(this)
+        .append("name", name)
+        .append("listenPort", listenPort)
+        .append("listenAddress", listenAddress)
+        .append("sslListenPort", sslListenPort)
+        .append("sslPortEnabled", sslPortEnabled)
+        .append("machineName", machineName)
+        .append("networkAccessPoints", networkAccessPoints)
+        .toString();
   }
 }

operator/src/test/java/oracle/kubernetes/operator/steps/ManagedServersUpStepTest.java

@@ -9,30 +9,16 @@
 import static oracle.kubernetes.operator.steps.ManagedServersUpStep.SERVERS_UP_MSG;
 import static oracle.kubernetes.operator.steps.ManagedServersUpStepTest.TestStepFactory.getServerStartupInfo;
 import static oracle.kubernetes.operator.steps.ManagedServersUpStepTest.TestStepFactory.getServers;
-import static oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants.START_ALWAYS;
-import static oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants.START_IF_NEEDED;
-import static oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants.START_NEVER;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.sameInstance;
+import static oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants.*;
+import static org.hamcrest.Matchers.*;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
 import com.meterware.simplestub.Memento;
 import com.meterware.simplestub.StaticStubSupport;
 import io.kubernetes.client.models.V1EnvVar;
 import io.kubernetes.client.models.V1ObjectMeta;
 import io.kubernetes.client.models.V1Pod;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import oracle.kubernetes.TestUtils;
@@ -53,7 +39,6 @@
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -428,7 +413,6 @@ public void withStartAllWhenWlsClusterNotInDomainSpec_addClusteredServersToListU
   }
 
   @Test
-  @Ignore
   public void whenWlsClusterNotInDomainSpec_recordServerAndClusterConfigs() {
     setCluster1Replicas(3);
     addWlsServers("ms1", "ms2", "ms3", "ms4", "ms5");
@@ -442,6 +426,17 @@ public void whenWlsClusterNotInDomainSpec_recordServerAndClusterConfigs() {
     assertThat(getServerStartupInfo("ms1").getNodePort(), nullValue());
   }
 
+  @Test
+  public void whenWlsClusterNotInDomainSpec_startUpToLimit() {
+    setCluster1Replicas(3);
+    addWlsServers("ms1", "ms2", "ms3", "ms4", "ms5");
+    addWlsCluster("cluster1", "ms1", "ms2", "ms3", "ms4", "ms5");
+
+    invokeStep();
+
+    assertThat(getServers(), containsInAnyOrder("ms1", "ms2", "ms3"));
+  }
+
   @Test
   public void withStartPolicyAlways_addNonManagedServers() {
     startAllServers();