Merge pull request #593 from oracle/schema-fix1

Support maxUnavailable

Author: rjeberhard

model/src/main/java/oracle/kubernetes/weblogic/domain/ClusterConfigurator.java

@@ -12,6 +12,8 @@
 public interface ClusterConfigurator {
   ClusterConfigurator withReplicas(int replicas);
 
+  ClusterConfigurator withMaxUnavailable(int maxUnavailable);
+
   ClusterConfigurator withDesiredState(String state);
 
   ClusterConfigurator withEnvironmentVariable(String name, String value);

model/src/main/java/oracle/kubernetes/weblogic/domain/EffectiveConfigurationFactory.java

@@ -22,6 +22,8 @@ public interface EffectiveConfigurationFactory {
 
   void setReplicaCount(String clusterName, int replicaCount);
 
+  int getMaxUnavailable(String clusterName);
+
   boolean isShuttingDown();
 
   List<String> getExportedNetworkAccessPointNames();

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Cluster.java

@@ -27,6 +27,11 @@ public class Cluster extends BaseConfiguration {
   @Range(minimum = 0)
   private Integer replicas;
 
+  @Description(
+      "The maximum number of cluster membrers that can be temporarily unavailable. Defaults to 1.")
+  @Range(minimum = 1)
+  private Integer maxUnavailable;
+
   public String getClusterName() {
     return clusterName;
   }
@@ -48,12 +53,21 @@ public void setReplicas(Integer replicas) {
     this.replicas = replicas;
   }
 
+  public Integer getMaxUnavailable() {
+    return maxUnavailable;
+  }
+
+  public void setMaxUnavailable(Integer maxUnavailable) {
+    this.maxUnavailable = maxUnavailable;
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this)
         .appendSuper(super.toString())
         .append("clusterName", clusterName)
         .append("replicas", replicas)
+        .append("maxUnavailable", maxUnavailable)
         .toString();
   }
 
@@ -69,6 +83,7 @@ public boolean equals(Object o) {
         .appendSuper(super.equals(o))
         .append(clusterName, cluster.clusterName)
         .append(replicas, cluster.replicas)
+        .append(maxUnavailable, cluster.maxUnavailable)
         .isEquals();
   }
 
@@ -78,6 +93,7 @@ public int hashCode() {
         .appendSuper(super.hashCode())
         .append(clusterName)
         .append(replicas)
+        .append(maxUnavailable)
         .toHashCode();
   }
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Domain.java

@@ -219,6 +219,26 @@ public void setReplicaCount(String clusterName, int replicaLimit) {
     getEffectiveConfigurationFactory().setReplicaCount(clusterName, replicaLimit);
   }
 
+  /**
+   * Returns the maximum number of unavailable replicas for the specified cluster.
+   *
+   * @param clusterName the name of the cluster
+   * @return the result of applying any configurations for this value
+   */
+  public int getMaxUnavailable(String clusterName) {
+    return getEffectiveConfigurationFactory().getMaxUnavailable(clusterName);
+  }
+
+  /**
+   * Returns the minimum number of replicas for the specified cluster.
+   *
+   * @param clusterName the name of the cluster
+   * @return the result of applying any configurations for this value
+   */
+  public int getMinAvailable(String clusterName) {
+    return Math.max(getReplicaCount(clusterName) - getMaxUnavailable(clusterName), 0);
+  }
+
   /**
    * DomainSpec is a description of a domain.
    *

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java

@@ -569,6 +569,14 @@ private boolean hasReplicaCount(Cluster cluster) {
     return cluster != null && cluster.getReplicas() != null;
   }
 
+  private int getMaxUnavailableFor(Cluster cluster) {
+    return hasMaxUnavailable(cluster) ? cluster.getMaxUnavailable() : 1;
+  }
+
+  private boolean hasMaxUnavailable(Cluster cluster) {
+    return cluster != null && cluster.getMaxUnavailable() != null;
+  }
+
   private AdminServer getAdminServer() {
     return Optional.ofNullable(adminServer).orElse(AdminServer.NULL_ADMIN_SERVER);
   }
@@ -619,6 +627,11 @@ public void setReplicaCount(String clusterName, int replicaCount) {
       getOrCreateCluster(clusterName).setReplicas(replicaCount);
     }
 
+    @Override
+    public int getMaxUnavailable(String clusterName) {
+      return getMaxUnavailableFor(getCluster(clusterName));
+    }
+
     @Override
     public List<String> getExportedNetworkAccessPointNames() {
       return getAdminServer().getExportedNetworkAccessPointNames();

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Configurator.java

@@ -375,6 +375,12 @@ public ClusterConfigurator withReplicas(int replicas) {
       return this;
     }
 
+    @Override
+    public ClusterConfigurator withMaxUnavailable(int maxUnavailable) {
+      cluster.setMaxUnavailable(maxUnavailable);
+      return this;
+    }
+
     @Override
     public ClusterConfigurator withDesiredState(String state) {
       cluster.setServerStartState(state);

model/src/test/java/oracle/kubernetes/weblogic/domain/DomainTestBase.java

@@ -289,6 +289,34 @@ public void afterReplicaCountSetForCluster_canChangeIt() {
     assertThat(domain.getReplicaCount("cluster1"), equalTo(4));
   }
 
+  @Test
+  public void afterReplicaCountMaxUnavailableSetForCluster_canReadMinAvailable() {
+    configureCluster("cluster1").withReplicas(5).withMaxUnavailable(2);
+
+    assertThat(domain.getMinAvailable("cluster1"), equalTo(3));
+  }
+
+  @Test
+  public void afterReplicaCountSetForCluster_canReadMinAvailable() {
+    configureCluster("cluster1").withReplicas(5);
+
+    assertThat(domain.getMinAvailable("cluster1"), equalTo(4));
+  }
+
+  @Test
+  public void afterReplicaCountMaxUnavailableSetForCluster_zeroMin() {
+    configureCluster("cluster1").withReplicas(3).withMaxUnavailable(10);
+
+    assertThat(domain.getMinAvailable("cluster1"), equalTo(0));
+  }
+
+  @Test
+  public void afterMaxUnavailableSetForCluster_canReadIt() {
+    configureCluster("cluster1").withMaxUnavailable(5);
+
+    assertThat(domain.getMaxUnavailable("cluster1"), equalTo(5));
+  }
+
   @Test
   public void whenServerNotConfigured_nodePortIsNull() {
     ServerSpec spec = domain.getServer(SERVER1, CLUSTER_NAME);

operator/src/main/java/oracle/kubernetes/operator/helpers/RollingHelper.java

@@ -35,8 +35,6 @@
 public class RollingHelper {
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
 
-  private static final int MINIMUM_FOR_CLUSTER = 2;
-
   private RollingHelper() {}
 
   /**
@@ -221,7 +219,7 @@ public NextAction apply(Packet packet) {
 
           // then add as many as possible next() entries leaving at least minimum cluster
           // availability
-          while (countReady-- > MINIMUM_FOR_CLUSTER) {
+          while (countReady-- > dom.getMinAvailable(clusterName)) {
             current = it.next();
             serverConfig = (WlsServerConfig) current.packet.get(ProcessingConstants.SERVER_SCAN);
             servers.add(