provide ServerHealth when HTTP response code for Read Health Step is 5xx

Author: alai8

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

@@ -36,10 +36,6 @@ public class HttpClient {
   private static final String HTTP_PROTOCOL = "http://";
   private static final String HTTPS_PROTOCOL = "https://";
 
-  // for debugging
-  private static final String SERVICE_URL =
-      System.getProperty("oracle.kubernetes.operator.http.HttpClient.SERVICE_URL");
-
   // Please use one of the factory methods to get an instance of HttpClient.
   // Constructor is package access for unit testing
   HttpClient(Client httpClient, String encodedCredentials) {

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

@@ -37,6 +37,14 @@ public boolean isSuccessful() {
     return successful;
   }
 
+  /**
+   * @return true if the HTTP status code from the REST request indicates a server error, ie in the
+   *     5xx range
+   */
+  public boolean isServerError() {
+    return status >= 500 && status <= 599;
+  }
+
   @Override
   public String toString() {
     return "Result{"

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

@@ -19,7 +19,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
+import oracle.kubernetes.operator.http.HTTPException;
 import oracle.kubernetes.operator.http.HttpClient;
+import oracle.kubernetes.operator.http.Result;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.logging.LoggingFilter;
@@ -96,6 +98,7 @@ private static String getRetrieveHealthSearchPayload() {
   static final class ReadHealthWithHttpClientStep extends Step {
     private final V1Service service;
     private final V1Pod pod;
+    static final String OVERALL_HEALTH_FOR_SERVER_ERROR = "Not available";
 
     ReadHealthWithHttpClientStep(V1Service service, V1Pod pod, Step next) {
       super(next);
@@ -138,16 +141,14 @@ public NextAction apply(Packet packet) {
                   serverConfig.getAdminProtocolChannelName(),
                   serverConfig.getListenPort());
           if (serviceURL != null) {
-            String jsonResult =
-                httpClient
-                    .executePostUrlOnServiceClusterIP(
-                        getRetrieveHealthSearchUrl(),
-                        serviceURL,
-                        getRetrieveHealthSearchPayload(),
-                        true)
-                    .getResponse();
+            Result result =
+                httpClient.executePostUrlOnServiceClusterIP(
+                    getRetrieveHealthSearchUrl(),
+                    serviceURL,
+                    getRetrieveHealthSearchPayload(),
+                    false);
 
-            ServerHealth health = parseServerHealthJson(jsonResult);
+            ServerHealth health = createServerHealthFromResult(result);
 
             @SuppressWarnings("unchecked")
             ConcurrentMap<String, ServerHealth> serverHealthMap =
@@ -171,6 +172,17 @@ public NextAction apply(Packet packet) {
       }
     }
 
+    private ServerHealth createServerHealthFromResult(Result restResult)
+        throws IOException, HTTPException {
+      if (restResult.isSuccessful()) {
+        return parseServerHealthJson(restResult.getResponse());
+      }
+      if (restResult.isServerError()) {
+        return new ServerHealth().withOverallHealth(OVERALL_HEALTH_FOR_SERVER_ERROR);
+      }
+      throw new HTTPException(restResult.getStatus());
+    }
+
     private ServerHealth parseServerHealthJson(String jsonResult) throws IOException {
       if (jsonResult == null) return null;