Merge branch 'master' into feature/dynamic-cluster

Author: alai8

operator/src/main/java/oracle/kubernetes/operator/http/HTTPException.java

@@ -11,6 +11,11 @@ public class HTTPException extends Exception {
   final int statusCode;
 
   public HTTPException(int statusCode) {
+    super("status code: " + statusCode);
     this.statusCode = statusCode;
   }
+
+  public int getStatusCode() {
+    return statusCode;
+  }
 }

operator/src/main/java/oracle/kubernetes/operator/http/HttpClient.java

@@ -76,6 +76,20 @@ public Result executeGetOnServiceClusterIP(String requestUrl, String serviceURL)
     return new Result(responseString, status, successful);
   }
 
+  /**
+   * Constructs a URL using the provided service URL and request URL, and use the resulting URL and the
+   * payload provided to issue a HTTP POST request.
+   * This method does not throw HTTPException if the HTTP request returns failure status code
+   *
+   * @param requestUrl The request URL containing the request of the REST call
+   * @param serviceURL The service URL containing the host and port of the server where the HTTP
+   *                   request is to be sent to
+   * @param payload The payload to be used in the HTTP POST request
+   *
+   * @return A Result object containing the respond from the REST call
+   * @throws HTTPException if throwOnFailure is true and the status of the HTTP response indicates the request was not
+   *                       successful
+   */
   public Result executePostUrlOnServiceClusterIP(String requestUrl, String serviceURL, String payload) {
     Result result = null;
     try {

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

@@ -134,11 +134,12 @@ private MessageKeys() {}
   public static final String CLUSTER_SERVICE_DELETED = "WLSKO-0124";
   public static final String INGRESS_DELETED = "WLSKO-0125";
   public static final String TUNING_PARAMETERS = "WLSKO-0126";
-  public static final String WLS_UPDATE_CLUSTER_SIZE_STARTING = "WLSKO-0127";
-  public static final String WLS_UPDATE_CLUSTER_SIZE_FAILED = "WLSKO-0128";
-  public static final String WLS_UPDATE_CLUSTER_SIZE_TIMED_OUT = "WLSKO-0129";
-  public static final String WLS_UPDATE_CLUSTER_SIZE_INVALID_CLUSTER = "WLSKO-0130";
-  public static final String WLS_CLUSTER_SIZE_UPDATED = "WLSKO-0131";
-  public static final String WLS_SERVER_TEMPLATE_NOT_FOUND = "WLSKO-0132";
-  public static final String WLS_CREATING_MACHINE = "WLSKO-0133";
+  public static final String WLS_HEALTH_READ_FAILED = "WLSKO-0127";
+  public static final String WLS_UPDATE_CLUSTER_SIZE_STARTING = "WLSKO-0128";
+  public static final String WLS_UPDATE_CLUSTER_SIZE_FAILED = "WLSKO-0129";
+  public static final String WLS_UPDATE_CLUSTER_SIZE_TIMED_OUT = "WLSKO-0130";
+  public static final String WLS_UPDATE_CLUSTER_SIZE_INVALID_CLUSTER = "WLSKO-0131";
+  public static final String WLS_CLUSTER_SIZE_UPDATED = "WLSKO-0132";
+  public static final String WLS_SERVER_TEMPLATE_NOT_FOUND = "WLSKO-0133";
+  public static final String WLS_CREATING_MACHINE = "WLSKO-0134";
 }

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

@@ -256,10 +256,10 @@ public NextAction apply(Packet packet) {
           WlsDomainConfig wlsDomainConfig = null;
           String jsonResult = httpClient.executePostUrlOnServiceClusterIP(
               WlsDomainConfig.getRetrieveServersSearchUrl(), serviceURL,
-              WlsDomainConfig.getRetrieveServersSearchPayload()).getResponse();
-          if (jsonResult != null) {
-            wlsDomainConfig = WlsDomainConfig.create(jsonResult);
-          }
+              WlsDomainConfig.getRetrieveServersSearchPayload(),
+          true).getResponse();
+
+          wlsDomainConfig = WlsDomainConfig.create(jsonResult);
 
           List<ConfigUpdate> suggestedConfigUpdates = new ArrayList<>();
 
@@ -269,7 +269,7 @@ public NextAction apply(Packet packet) {
 
           info.setScan(wlsDomainConfig);
           info.setLastScanTime(new DateTime());
-    
+
           LOGGER.info(MessageKeys.WLS_CONFIGURATION_READ, (System.currentTimeMillis() - ((Long) packet.get(START_TIME))), wlsDomainConfig);
 
           // If there are suggested WebLogic configuration update, perform them as the
@@ -286,8 +286,8 @@ public NextAction apply(Packet packet) {
         } else { // RequestType.HEALTH
           String jsonResult = httpClient.executePostUrlOnServiceClusterIP(
               getRetrieveHealthSearchUrl(), serviceURL,
-              getRetrieveHealthSearchPayload()).getResponse();
-          
+              getRetrieveHealthSearchPayload(), true).getResponse();
+
           ObjectMapper mapper = new ObjectMapper();
           JsonNode root = mapper.readTree(jsonResult);
 
@@ -335,8 +335,12 @@ public NextAction apply(Packet packet) {
 
         return doNext(packet);
       } catch (Throwable t) {
-        LOGGER.warning(MessageKeys.WLS_CONFIGURATION_READ_FAILED, t);
-
+        if (RequestType.CONFIG.equals(requestType)) {
+          LOGGER.warning(MessageKeys.WLS_CONFIGURATION_READ_FAILED, t);
+        } else {
+          LOGGER.warning(MessageKeys.WLS_HEALTH_READ_FAILED, packet.get(ProcessingConstants.SERVER_NAME), t);
+        }
+        
         // exponential back-off
         Integer retryCount = (Integer) packet.get(RETRY_COUNT);
         if (retryCount == null) {

operator/src/main/resources/Operator.properties

@@ -125,10 +125,11 @@ WLSKO-0123=Service for domain with domainUID {0} in namespace {1} and with serve
 WLSKO-0124=Service for domain with domainUID {0} in namespace {1} and with cluster name {2} deleted; validating domain
 WLSKO-0125=Ingress for domain with domainUID {0} in namespace {1} and with cluster name {2} deleted; validating domain
 WLSKO-0126=Reloading tuning parameters from Operator's config map
-WLSKO-0127=Updating cluster size for WebLogic dynamic cluster {0} to {1}
-WLSKO-0128=Failed to update WebLogic dynamic cluster size for cluster {0} due to exception: {1}
-WLSKO-0129=Failed to update WebLogic dynamic cluster size for cluster {0} within timeout of {1} milliseconds
-WLSKO-0130=Failed to update WebLogic dynamic cluster size for cluster {0}. Cluster is not a dynamic cluster
-WLSKO-0131=Updated cluster size for WebLogic dynamic cluster {0} to {1}. Time taken {2} ms
-WLSKO-0132=Cannot find WebLogic server template with name {0} which is referenced by WebLogic cluster {1}
-WLSKO-0133=Creating WebLogic machine named {0}
+WLSKO-0127=Failed to read health information from server {0} due to exception: {1}
+WLSKO-0128=Updating cluster size for WebLogic dynamic cluster {0} to {1}
+WLSKO-0129=Failed to update WebLogic dynamic cluster size for cluster {0} due to exception: {1}
+WLSKO-0130=Failed to update WebLogic dynamic cluster size for cluster {0} within timeout of {1} milliseconds
+WLSKO-0131=Failed to update WebLogic dynamic cluster size for cluster {0}. Cluster is not a dynamic cluster
+WLSKO-0132=Updated cluster size for WebLogic dynamic cluster {0} to {1}. Time taken {2} ms
+WLSKO-0133=Cannot find WebLogic server template with name {0} which is referenced by WebLogic cluster {1}
+WLSKO-0134=Creating WebLogic machine named {0}