use patching to scale clusters

Author: russgold

operator/src/main/java/oracle/kubernetes/operator/rest/RestBackendImpl.java

@@ -29,7 +29,6 @@
 import oracle.kubernetes.operator.helpers.AuthorizationProxy.Resource;
 import oracle.kubernetes.operator.helpers.AuthorizationProxy.Scope;
 import oracle.kubernetes.operator.helpers.CallBuilder;
-import oracle.kubernetes.operator.helpers.ConflictRetry;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.logging.MessageKeys;
@@ -73,11 +72,6 @@ public class RestBackendImpl implements RestBackend {
     LOGGER.exiting();
   }
 
-  private void authorize(String domainUID, String cluster, Operation operation) {
-    // TBD - should cluster atz be different than domain atz?
-    authorize(domainUID, operation);
-  }
-
   private void authorize(String domainUID, Operation operation) {
     LOGGER.entering(domainUID, operation);
     boolean authorized;
@@ -211,7 +205,7 @@ public Set<String> getClusters(String domainUID) {
   @Override
   public boolean isCluster(String domainUID, String cluster) {
     LOGGER.entering(domainUID, cluster);
-    authorize(domainUID, cluster, Operation.list);
+    authorize(domainUID, Operation.list);
     boolean result = getClusters(domainUID).contains(cluster);
     LOGGER.exiting(result);
     return result;
@@ -226,25 +220,14 @@ public void scaleCluster(String domainUID, String cluster, int managedServerCoun
           Status.BAD_REQUEST, MessageKeys.INVALID_MANAGE_SERVER_COUNT, managedServerCount);
     }
 
-    authorize(domainUID, cluster, Operation.update);
+    authorize(domainUID, Operation.update);
 
     List<Domain> domains = getDomainsList();
     Domain domain = findDomain(domainUID, domains);
 
-    String namespace = getNamespace(domainUID, domains);
-
     verifyWLSConfiguredClusterCapacity(domain, cluster, managedServerCount);
 
-    /*/
     patchDomain(domain, cluster, managedServerCount);
-    /*/
-    if (updateReplicasForDomain(domain, cluster, managedServerCount)) {
-      overwriteDomain(
-          namespace,
-          domain,
-          () -> getDomainForConflictRetry(domainUID, cluster, managedServerCount));
-    }
-    /**/
     LOGGER.exiting();
   }
 
@@ -276,39 +259,6 @@ private int getClusterIndex(Domain domain, String cluster) {
     return -1;
   }
 
-  private boolean updateReplicasForDomain(Domain domain, String cluster, int newReplicaCount) {
-    if (newReplicaCount != domain.getReplicaCount(cluster)) {
-      domain.setReplicaCount(cluster, newReplicaCount);
-      return true;
-    }
-    return false;
-  }
-
-  private void overwriteDomain(
-      String namespace, final Domain domain, ConflictRetry<Domain> conflictRetry) {
-    try {
-      // Write out the Domain with updated replica values
-      // TODO: Can we patch instead of replace?
-      new CallBuilder()
-          .replaceDomainWithConflictRetry(domain.getDomainUID(), namespace, domain, conflictRetry);
-    } catch (ApiException e) {
-      LOGGER.finer(
-          String.format(
-              "Unexpected exception when updating Domain %s in namespace %s",
-              domain.getDomainUID(), namespace),
-          e);
-      throw new WebApplicationException(e.getMessage());
-    }
-  }
-
-  Domain getDomainForConflictRetry(String domainUid, String cluster, int newReplicaCount) {
-    Domain domain = findDomain(domainUid, getDomainsList());
-    if (updateReplicasForDomain(domain, cluster, newReplicaCount)) {
-      return domain;
-    }
-    return null;
-  }
-
   private void verifyWLSConfiguredClusterCapacity(
       Domain domain, String cluster, int requestedSize) {
     // Query WebLogic Admin Server for current configured WebLogic Cluster size
@@ -336,11 +286,11 @@ private Map<String, WlsClusterConfig> getWLSConfiguredClusters(String domainUID)
     return getWlsDomainConfig(domainUID).getClusterConfigs();
   }
 
-  static interface TopologyRetriever {
-    public WlsDomainConfig getWlsDomainConfig(String ns, String domainUID);
+  interface TopologyRetriever {
+    WlsDomainConfig getWlsDomainConfig(String ns, String domainUID);
   }
 
-  static final TopologyRetriever INSTANCE =
+  private static final TopologyRetriever INSTANCE =
       (String ns, String domainUID) -> {
         Scan s = ScanCache.INSTANCE.lookupScan(ns, domainUID);
         if (s != null) {

operator/src/test/java/oracle/kubernetes/operator/rest/RestBackendImplTest.java

@@ -160,34 +160,6 @@ public void whenReplaceDomainReturnsError_scaleClusterThrowsException() {
     restBackend.scaleCluster(NAME2, "cluster1", 3);
   }
 
-  @Test
-  public void getDomainForConflictRetry_returnsBeforeDomain() {
-    configureDomain().withDefaultReplicaCount(2);
-
-    assertThat(
-        ((RestBackendImpl) restBackend)
-            .getDomainForConflictRetry(NAME1, "cluster1", REPLICA_LIMIT)
-            .getReplicaCount("cluster-1"),
-        equalTo(2));
-  }
-
-  @Test
-  public void getDomainForConflictRetry_ifSameReplicaCount_returnsNull() {
-    configureDomain().withDefaultReplicaCount(REPLICA_LIMIT);
-
-    assertThat(
-        ((RestBackendImpl) restBackend).getDomainForConflictRetry(NAME1, "cluster1", REPLICA_LIMIT),
-        nullValue());
-  }
-
-  @Test(expected = WebApplicationException.class)
-  public void getDomainForConflictRetry_ifDomainNotFound_throws() {
-    configureDomain().withDefaultReplicaCount(2);
-
-    ((RestBackendImpl) restBackend)
-        .getDomainForConflictRetry("noSuchUID", "cluster1", REPLICA_LIMIT);
-  }
-
   @Test
   public void verify_getWlsDomainConfig_returnsWlsDomainConfig() {
     WlsDomainConfig wlsDomainConfig = ((RestBackendImpl) restBackend).getWlsDomainConfig(NAME1);