Merge remote-tracking branch 'origin/develop' into quickstart-sample-updates

Author: doxiao

README.md

@@ -52,13 +52,13 @@ maintained for one release after a replacement is available.
 
 # About this documentation
 
-This documentation includes sections aimed at different audiences.  To help you find what you are looking for more easily,
+This documentation includes sections targeted to different audiences.  To help you find what you are looking for more easily,
 please consult this table of contents:
 
-* The [Quick start guide](site/quickstart.md) explains how to just get the operator running quickly, using all the defaults, nothing special.
-* The [User guide](site/user-guide.md) contains detailed information for users of the operator, including how to install and configure it,
+* The [Quick start guide](site/quickstart.md) explains how to quickly get the operator running, using the defaults, nothing special.
+* The [User guide](site/user-guide.md) contains detailed usage information, including how to install and configure the operator,
   and how to use it to create and manage WebLogic domains.  
-* Our [Samples](kubernetes/samples/README.md) provide detailed example code and instructions that show you how to perform
+* The [Samples](kubernetes/samples/README.md) provide detailed example code and instructions that show you how to perform
   various tasks related to the operator.
 * The [Developer guide](site/developer.md) provides details for people who want to understand how the operator is built, tested, and so on. Those who wish to contribute to the operator code will find useful information here.  This section also includes
   API documentation (Javadoc) and Swagger/OpenAPI documentation for the REST APIs.
@@ -81,7 +81,7 @@ The [User guide](site/user-guide.md) provides detailed information about all asp
 
 # Samples
 
-Please refer to our [samples](kubernetes/samples/README.md) for information about the available sample code we provide.
+Please refer to our [samples](kubernetes/samples/README.md) for information about the available sample code.
 
 # Need more help? Have a suggestion? Come and say "Hello!"
 
@@ -98,17 +98,17 @@ See [Recent changes](site/recent-changes.md) for changes to the operator, includ
 
 Developers interested in this project are encouraged to read the [Developer guide](site/developer.md) to learn how to build the project, run tests, and so on.  The Developer guide also provides details about the structure of the code, coding standards, and the Asynchronous Call facility used in the code to manage calls to the Kubernetes API.
 
-Please take a look at our [wish list](https://github.com/oracle/weblogic-kubernetes-operator/wiki/Wish-list) to get an idea of the kind of features we would like to add to the operator.  Maybe you will see something you would like to contribute to!
+Please take a look at our [wish list](https://github.com/oracle/weblogic-kubernetes-operator/wiki/Wish-list) to get an idea of the kind of features we would like to add to the operator.  Maybe you will see something to which you would like to contribute!
 
 ## API documentation
 
 Documentation for APIs is provided here:
 
-* The operator provides a REST API that you can use to obtain information about the configuration and to initiate scaling actions. For details about how to use the REST APIs, see [Using the operator's REST services](site/rest.md).
+* The operator provides a REST API that you can use to obtain configuration information and to initiate scaling actions. For details about how to use the REST APIs, see [Using the operator's REST services](site/rest.md).
 
 * See the [Swagger](https://oracle.github.io/weblogic-kubernetes-operator/swagger/index.html) documentation for the operator's REST interface.
 
-* [Javadoc](https://oracle.github.io/weblogic-kubernetes-operator/apidocs/index.html) for the operator.
+* See the [Javadoc](https://oracle.github.io/weblogic-kubernetes-operator/apidocs/index.html) for the operator.
 
 # Contributing to the operator
 

kubernetes/samples/scripts/elasticsearch-and-kibana/README.md

@@ -1,23 +1,21 @@
 # Sample to deploy Elasticsearch and Kibana
 
 
-When a user installs the WebLogic operator Helm chart, the user can set
-`elkIntegrationEnabled` to `true` in their `values.yaml` to tell the operator to send the
-contents of the operator's logs to Elasticsearch.
+When you install the WebLogic operator Helm chart, you can set
+`elkIntegrationEnabled` to `true` in your `values.yaml` file to tell the operator to send the contents of the operator's logs to Elasticsearch.
 
-Typically, a user would have already configured Elasticsearch and Kibana in the
-Kubernetes cluster, and also would specify `elasticSearchHost` and `elasticSearchPort`
-in their `values.yaml` file to point to where Elasticsearch is already running.
+Typically, you would have already configured Elasticsearch and Kibana in the
+Kubernetes cluster, and also would have specified `elasticSearchHost` and `elasticSearchPort` in your `values.yaml` file to point to where Elasticsearch is already running.
 
 This sample configures the Elasticsearch and Kibana deployments and services.
 It's useful for trying out the operator in a Kubernetes cluster that doesn't already
 have them configured.
 
-It runs Elasticstack on the same host and port that the operator's Helm chart defaults
-to, therefore, the customer only needs to set `elkIntegrationEnabled` to `true` in their
+It runs the Elastic Stack on the same host and port that the operator's Helm chart defaults
+to, therefore, you only need to set `elkIntegrationEnabled` to `true` in your
 `values.yaml` file.
 
-To install ElasticSearch and Kibana, use:
+To install Elasticsearch and Kibana, use:
 ```
 $  kubectl apply -f kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml
 ```

operator/src/main/java/oracle/kubernetes/operator/Watcher.java

@@ -1,4 +1,4 @@
-// Copyright 2017, 2018 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2017, 2019 Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -126,13 +126,7 @@ private void watchForEvents() {
                 .withResourceVersion(resourceVersion.toString())
                 .withTimeoutSeconds(tuning.watchLifetime))) {
       while (watch.hasNext()) {
-        Watch.Response<T> item;
-        try {
-          item = watch.next();
-        } catch (Throwable e) {
-          watch.discardClient();
-          throw e;
-        }
+        Watch.Response<T> item = watch.next();
 
         if (isStopping()) setIsDraining(true);
         if (isDraining()) continue;

operator/src/main/java/oracle/kubernetes/operator/builders/WatchI.java

@@ -1,4 +1,4 @@
-// Copyright 2018 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -14,6 +14,4 @@
  * @param <T> the generic object type
  */
 public interface WatchI<T>
-    extends Iterable<Watch.Response<T>>, Iterator<Watch.Response<T>>, java.io.Closeable {
-  default void discardClient() {}
-}
+    extends Iterable<Watch.Response<T>>, Iterator<Watch.Response<T>>, java.io.Closeable {}

operator/src/main/java/oracle/kubernetes/operator/builders/WatchImpl.java

@@ -1,4 +1,4 @@
-// Copyright 2018 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -28,12 +28,7 @@ public class WatchImpl<T> implements WatchI<T> {
   @Override
   public void close() throws IOException {
     impl.close();
-    pool.recycle(client);
-  }
-
-  @Override
-  public void discardClient() {
-    client = pool.take();
+    if (client != null) pool.recycle(client);
   }
 
   @Override
@@ -49,6 +44,11 @@ public boolean hasNext() {
 
   @Override
   public Watch.Response<T> next() {
-    return impl.next();
+    try {
+      return impl.next();
+    } catch (Exception e) {
+      client = null;
+      throw e;
+    }
   }
 }

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

@@ -1,4 +1,4 @@
-// Copyright 2017, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2017, 2019 Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -17,7 +17,7 @@
 
 public class ClientPool extends Pool<ApiClient> {
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
-  private static final ClientPool SINGLETON = new ClientPool();
+  private static ClientPool SINGLETON = new ClientPool();
 
   private static final ClientFactory FACTORY = new DefaultClientFactory();
 
@@ -27,8 +27,6 @@ public static ClientPool getInstance() {
 
   private final AtomicBoolean isFirst = new AtomicBoolean(true);
 
-  private ClientPool() {}
-
   @Override
   protected ApiClient create() {
     return getApiClient();

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

@@ -1,10 +1,10 @@
-// Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2017, 2019 Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.helpers;
 
-import java.lang.ref.WeakReference;
+import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
@@ -14,7 +14,7 @@ public abstract class Pool<T> {
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
 
   // volatile since multiple threads may access queue reference
-  private volatile WeakReference<ConcurrentLinkedQueue<T>> queue;
+  private volatile Queue<T> queue = new ConcurrentLinkedQueue<>();
 
   /**
    * Gets a new object from the pool. If no object is available in the pool, this method creates a
@@ -36,20 +36,8 @@ public final T take() {
     return instance;
   }
 
-  private ConcurrentLinkedQueue<T> getQueue() {
-    WeakReference<ConcurrentLinkedQueue<T>> referenceQueue = queue;
-    if (referenceQueue != null) {
-      ConcurrentLinkedQueue<T> returnQueue = referenceQueue.get();
-      if (returnQueue != null) {
-        return returnQueue;
-      }
-    }
-
-    // overwrite the queue
-    ConcurrentLinkedQueue<T> d = new ConcurrentLinkedQueue<>();
-    queue = new WeakReference<>(d);
-
-    return d;
+  protected Queue<T> getQueue() {
+    return queue;
   }
 
   /**
@@ -72,9 +60,4 @@ public final void recycle(T instance) {
    * @return Created instance
    */
   protected abstract T create();
-
-  /** Drains pool of all entries; useful for unit-testing */
-  public void drain() {
-    getQueue().clear();
-  }
 }

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

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

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;
@@ -63,6 +64,17 @@ void addServerIfNeeded(@Nonnull WlsServerConfig serverConfig, WlsClusterConfig c
       }
     }
 
+    boolean exceedsMaxConfiguredClusterSize(WlsClusterConfig clusterConfig) {
+      if (clusterConfig != null) {
+        String clusterName = clusterConfig.getClusterName();
+        int configMaxClusterSize = clusterConfig.getMaxDynamicClusterSize();
+        return clusterConfig.hasDynamicServers()
+            && clusterConfig.getServerConfigs().size() == configMaxClusterSize
+            && domain.getReplicaCount(clusterName) > configMaxClusterSize;
+      }
+      return false;
+    }
+
     private Step createNextStep(Step next) {
       if (servers.isEmpty()) return next;
       else return new ManagedServerUpIteratorStep(getStartupInfos(), next);
@@ -84,6 +96,17 @@ private void addToCluster(String clusterName) {
     private Integer getReplicaCount(String clusterName) {
       return Optional.ofNullable(replicas.get(clusterName)).orElse(0);
     }
+
+    private void logIfReplicasExceedsClusterServersMax(WlsClusterConfig clusterConfig) {
+      if (exceedsMaxConfiguredClusterSize(clusterConfig)) {
+        String clusterName = clusterConfig.getClusterName();
+        LOGGER.warning(
+            MessageKeys.REPLICAS_EXCEEDS_TOTAL_CLUSTER_SERVER_COUNT,
+            domain.getReplicaCount(clusterName),
+            clusterConfig.getMaxDynamicClusterSize(),
+            clusterName);
+      }
+    }
   }
 
   public ManagedServersUpStep(Step next) {
@@ -105,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

@@ -143,4 +143,5 @@ 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-0145=Replacing pod {0} with {1}
+WLSKO-0145=Replacing pod {0} with {1}
+WLSKO-0146=Replica request of {0} exceeds the maximum dynamic server count + server count of {1} configured for cluster {2}