add log message when ReadHealthStep fails

Author: alai8

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

@@ -154,4 +154,5 @@ private MessageKeys() {}
   public static final String EXTERNAL_CHANNEL_SERVICE_CREATED = "WLSKO-0150";
   public static final String EXTERNAL_CHANNEL_SERVICE_REPLACED = "WLSKO-0151";
   public static final String EXTERNAL_CHANNEL_SERVICE_EXISTS = "WLSKO-0152";
+  public static final String WLS_HEALTH_READ_FAILED_NO_HTTPCLIENT = "WLSKO-0153";
 }

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

@@ -17,6 +17,7 @@
 import oracle.kubernetes.operator.http.HttpClient;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
+import oracle.kubernetes.operator.logging.LoggingFilter;
 import oracle.kubernetes.operator.logging.MessageKeys;
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
@@ -93,6 +94,10 @@ public NextAction apply(Packet packet) {
         HttpClient httpClient = (HttpClient) packet.get(HttpClient.KEY);
 
         if (httpClient == null) {
+          LOGGER.info(
+              (LoggingFilter) packet.get(LoggingFilter.LOGGING_FILTER_PACKET_KEY),
+              MessageKeys.WLS_HEALTH_READ_FAILED_NO_HTTPCLIENT,
+              packet.get(ProcessingConstants.SERVER_NAME));
           return doNext(packet);
         }
 
@@ -158,8 +163,11 @@ public NextAction apply(Packet packet) {
         return doNext(packet);
       } catch (Throwable t) {
         // do not retry for health check
-        LOGGER.fine(
-            MessageKeys.WLS_HEALTH_READ_FAILED, packet.get(ProcessingConstants.SERVER_NAME), t);
+        LOGGER.info(
+            (LoggingFilter) packet.get(LoggingFilter.LOGGING_FILTER_PACKET_KEY),
+            MessageKeys.WLS_HEALTH_READ_FAILED,
+            packet.get(ProcessingConstants.SERVER_NAME),
+            t);
         return doNext(packet);
       }
     }

operator/src/main/resources/Operator.properties

@@ -150,3 +150,4 @@ WLSKO-0148=Current Pod dump [{0}] vs expected pod [{1}].
 WLSKO-0150=Creating external channel service for WebLogic domain with UID: {0}.
 WLSKO-0151=Replacing external channel service for WebLogic domain with UID: {0}.
 WLSKO-0152=Existing external channel service is correct for WebLogic domain with UID: {0}.
+WLSKO-0153=Failed to read health information from server {0}. Unable to connect to server.

operator/src/test/java/oracle/kubernetes/LogMatcher.java

@@ -32,6 +32,10 @@ public static LogMatcher containsInfo(String expectedMessage) {
     return new LogMatcher(Level.INFO, expectedMessage);
   }
 
+  public static LogMatcher containsInfo(String expectedMessage, Object expectedParameter) {
+    return new LogMatcher(Level.INFO, expectedMessage, expectedParameter);
+  }
+
   public static LogMatcher containsWarning(String expectedMessage) {
     return new LogMatcher(Level.WARNING, expectedMessage);
   }

operator/src/test/java/oracle/kubernetes/operator/steps/ReadHealthStepTest.java

@@ -4,8 +4,9 @@
 
 package oracle.kubernetes.operator.steps;
 
-import static oracle.kubernetes.LogMatcher.containsFine;
+import static oracle.kubernetes.LogMatcher.containsInfo;
 import static oracle.kubernetes.operator.logging.MessageKeys.WLS_HEALTH_READ_FAILED;
+import static oracle.kubernetes.operator.logging.MessageKeys.WLS_HEALTH_READ_FAILED_NO_HTTPCLIENT;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
@@ -20,7 +21,6 @@
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.http.HttpClient;
 import oracle.kubernetes.operator.steps.ReadHealthStep.ReadHealthWithHttpClientStep;
-import oracle.kubernetes.operator.work.Component;
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
@@ -30,7 +30,9 @@
 
 public class ReadHealthStepTest {
   // The log messages to be checked during this test
-  private static final String[] LOG_KEYS = {WLS_HEALTH_READ_FAILED};
+  private static final String[] LOG_KEYS = {
+    WLS_HEALTH_READ_FAILED, WLS_HEALTH_READ_FAILED_NO_HTTPCLIENT
+  };
 
   private List<LogRecord> logRecords = new ArrayList<>();
   private Memento consoleControl;
@@ -52,6 +54,23 @@ public void tearDown() {
 
   @Test
   public void withHttpClientStep_Health_logIfFailed() {
+    V1Service service = Stub.createStub(V1ServiceStub.class);
+    Step next = new MockStep(null);
+    final String SERVER_NAME = "admin-server";
+    Packet packet =
+        Stub.createStub(PacketStub.class)
+            .withServerName(SERVER_NAME)
+            .withGetKeyThrowsException(true);
+
+    ReadHealthWithHttpClientStep withHttpClientStep =
+        new ReadHealthWithHttpClientStep(service, next);
+    withHttpClientStep.apply(packet);
+
+    assertThat(logRecords, containsInfo(WLS_HEALTH_READ_FAILED, SERVER_NAME));
+  }
+
+  @Test
+  public void withHttpClientStep_logIfMissingHTTPClient() {
     V1Service service = Stub.createStub(V1ServiceStub.class);
     Step next = new MockStep(null);
     final String SERVER_NAME = "admin-server";
@@ -61,29 +80,31 @@ public void withHttpClientStep_Health_logIfFailed() {
         new ReadHealthWithHttpClientStep(service, next);
     withHttpClientStep.apply(packet);
 
-    assertThat(logRecords, containsFine(WLS_HEALTH_READ_FAILED, SERVER_NAME));
+    assertThat(logRecords, containsInfo(WLS_HEALTH_READ_FAILED_NO_HTTPCLIENT, SERVER_NAME));
   }
 
   abstract static class PacketStub extends Packet {
 
-    Integer retryCount;
     String serverName;
+    boolean getKeyThrowsException;
 
-    PacketStub withServerName(String serverName) {
-      this.serverName = serverName;
+    PacketStub withGetKeyThrowsException(boolean getKeyThrowsException) {
+      this.getKeyThrowsException = getKeyThrowsException;
       return this;
     }
 
-    PacketStub addSpi(Class clazz, Object spiObject) {
-      Component component = Component.createFor(spiObject);
-      this.getComponents().put(clazz.getName(), component);
+    PacketStub withServerName(String serverName) {
+      this.serverName = serverName;
       return this;
     }
 
     @Override
     public Object get(Object key) {
       if (HttpClient.KEY.equals(key)) {
-        throw CLASSCAST_EXCEPTION; // to go to catch clause in WithHttpClientStep.apply() method
+        if (getKeyThrowsException) {
+          throw CLASSCAST_EXCEPTION; // to go to catch clause in WithHttpClientStep.apply() method
+        }
+        return null;
       } else if (ProcessingConstants.SERVER_NAME.equals(key)) {
         return serverName;
       }