Merge pull request #845 from oracle/OWLS-71453

Owls 71453: Operator logs NPE after (correctly) logging introspector validation errors.

Author: rjeberhard

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

@@ -14,6 +14,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -269,11 +270,10 @@ public NextAction apply(Packet packet) {
       if (topologyYaml != null) {
         LOGGER.fine("topology.yaml: " + topologyYaml);
         DomainTopology domainTopology = parseDomainTopologyYaml(topologyYaml);
-        if (!domainTopology.getValidationErrors().isEmpty()) {
-          for (String err : domainTopology.getValidationErrors()) {
-            LOGGER.severe(err);
-          }
-          doNext(null, packet);
+        if (!domainTopology.getDomainValid()) {
+          // If introspector determines Domain is invalid then log erros and terminate the fiber
+          logValidationErrors(domainTopology.getValidationErrors());
+          return doNext(null, packet);
         }
         WlsDomainConfig wlsDomainConfig = domainTopology.getDomain();
         ScanCache.INSTANCE.registerScan(
@@ -294,6 +294,14 @@ public NextAction apply(Packet packet) {
       return doNext(getNext(), packet);
     }
 
+    private void logValidationErrors(List<String> validationErrors) {
+      if (!validationErrors.isEmpty()) {
+        for (String err : validationErrors) {
+          LOGGER.severe(err);
+        }
+      }
+    }
+
     private static String getOperatorNamespace() {
       String namespace = System.getenv("OPERATOR_NAMESPACE");
       if (namespace == null) {
@@ -582,7 +590,11 @@ public static class DomainTopology {
     private List<String> validationErrors;
 
     public boolean getDomainValid() {
-      return this.domainValid;
+      // domainValid = true AND no validation errors exist
+      if (domainValid && getValidationErrors().isEmpty()) {
+        return true;
+      }
+      return false;
     }
 
     public void setDomainValid(boolean domainValid) {
@@ -599,11 +611,30 @@ public void setDomain(WlsDomainConfig domain) {
     }
 
     public List<String> getValidationErrors() {
-      return validationErrors == null ? Collections.emptyList() : validationErrors;
+      if (validationErrors == null) {
+        validationErrors = Collections.emptyList();
+      }
+
+      if (!domainValid && validationErrors.isEmpty()) {
+        // add a log message that domain was marked invalid since we have no validation
+        // errors from introspector.
+        validationErrors = new ArrayList<>();
+        validationErrors.add(
+            "Error, domain is invalid although there are no validation errors from introspector job.");
+      }
+
+      return validationErrors;
     }
 
     public void setValidationErrors(List<String> validationErrors) {
       this.validationErrors = validationErrors;
     }
+
+    public String toString() {
+      if (domainValid) {
+        return "domain: " + domain;
+      }
+      return "domainValid: " + domainValid + ", validationErrors: " + validationErrors;
+    }
   }
 }

operator/src/test/java/oracle/kubernetes/operator/helpers/ConfigMapHelperTest.java

@@ -472,6 +472,9 @@ public boolean containsAll(V1ConfigMap actual, V1ConfigMap expected) {
           + "validationErrors:\n"
           + "  - \"The dynamic cluster \\\"mycluster\\\"'s dynamic servers use calculated listen ports.\"";
 
+  private static final String DOMAIN_INVALID_NO_ERRORS =
+      "domainValid: false\n" + "validationErrors:\n";
+
   @Test
   public void parseDomainTopologyYaml() {
     ConfigMapHelper.DomainTopology domainTopology =
@@ -654,4 +657,13 @@ public void parseInvalidTopologyYamlWithValidationErrors() {
         "The dynamic cluster \"mycluster\"'s dynamic servers use calculated listen ports.",
         domainTopology.getValidationErrors().get(0));
   }
+
+  @Test
+  public void parseInvalidTopologyYamlWithNoValidationErrors() {
+    ConfigMapHelper.DomainTopology domainTopology =
+        ConfigMapHelper.parseDomainTopologyYaml(DOMAIN_INVALID_NO_ERRORS);
+
+    assertFalse(domainTopology.getValidationErrors().isEmpty());
+    assertFalse(domainTopology.getDomainValid());
+  }
 }