OWLS-90971 - Fix for admin server restart when Domain CR patched with incorrect auxiliary image command. (#2465)

* OWLS-90971 - Fix for admin server restart when Domain CR patched with incorrect auxiliary image command.

* Rename method and introduce constant.

Author: ankedia

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java

@@ -63,6 +63,7 @@
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.secretExists;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.verifyRollingRestartOccurred;
 import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createDomainResource;
+import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.verifyPodsNotRolled;
 import static oracle.weblogic.kubernetes.utils.CommonPatchTestUtils.patchDomainResource;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkDomainEventContainsExpectedMsg;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodDoesNotExist;
@@ -708,16 +709,13 @@ public void testErrorPathDomainWithFailCustomMountCommand() {
     checkPodLogContainsString(opNamespace, operatorPodName, expectedErrorMsg);
 
     // verify the domain is not rolled
-    // TODO: enable this check once https://jira.oraclecorp.com/jira/browse/OWLS-90971 is fixed
-    /*
     logger.info("sleep 2 minutes to make sure the domain is not restarted");
     try {
       Thread.sleep(120000);
     } catch (InterruptedException ie) {
       // ignore
     }
     verifyPodsNotRolled(domainNamespace, pods);
-    */
 
     // restore domain1
     // patch the first auxiliary image to remove the domain.spec.serverPod.auxiliaryImages.command

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

@@ -57,6 +57,7 @@
 import static oracle.kubernetes.operator.DomainStatusUpdater.createProgressingStartedEventStep;
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_DOMAIN_SPEC_GENERATION;
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_STATE_LABEL;
+import static oracle.kubernetes.operator.ProcessingConstants.DOMAIN_INTROSPECT_REQUESTED;
 import static oracle.kubernetes.operator.logging.MessageKeys.INTROSPECTOR_JOB_FAILED;
 import static oracle.kubernetes.operator.logging.MessageKeys.INTROSPECTOR_JOB_FAILED_DETAIL;
 
@@ -98,7 +99,7 @@ private static boolean runIntrospector(Packet packet, DomainPresenceInfo info) {
     LOGGER.fine("isModelInImageUpdate: " + isModelInImageUpdate(packet, info));
     return topology == null
           || isBringingUpNewDomain(packet, info)
-          || isIntrospectionRequestedAndRemove(packet)
+          || checkIfIntrospectionRequestedAndReset(packet)
           || isModelInImageUpdate(packet, info)
           || isIntrospectVersionChanged(packet, info);
   }
@@ -107,8 +108,8 @@ private static boolean isBringingUpNewDomain(Packet packet, DomainPresenceInfo i
     return runningServersCount(info) == 0 && creatingServers(info) && isGenerationChanged(packet, info);
   }
 
-  private static boolean isIntrospectionRequestedAndRemove(Packet packet) {
-    return packet.remove(ProcessingConstants.DOMAIN_INTROSPECT_REQUESTED) != null;
+  private static boolean checkIfIntrospectionRequestedAndReset(Packet packet) {
+    return packet.remove(DOMAIN_INTROSPECT_REQUESTED) != null;
   }
 
   private static boolean isIntrospectVersionChanged(Packet packet, DomainPresenceInfo info) {
@@ -506,6 +507,7 @@ private Step readDomainIntrospectorPodLog(String jobPodName, String namespace, S
   }
 
   private static class ReadDomainIntrospectorPodLogResponseStep extends ResponseStep<String> {
+    public static final String INTROSPECTION_FAILED = "INTROSPECTION_FAILED";
     private StringBuilder logMessage = new StringBuilder();
     private final List<String> severeStatuses = new ArrayList<>();
 
@@ -552,6 +554,7 @@ public NextAction onSuccess(Packet packet, CallResponse<String> callResponse) {
                 getJobCreationTime(domainIntrospectorJob).plus(retryIntervalSeconds, SECONDS))) {
           //Introspector job is incomplete and current time is greater than the lazy deletion time for the job,
           //update the domain status and execute the next step
+          packet.put(DOMAIN_INTROSPECT_REQUESTED, INTROSPECTION_FAILED);
           nextStep = getNext();
         }