Merge branch 'OWLS-109611' into 'main'

Owls 109611: clear FAILED/Aborted condition in waitForJobComplete code path

See merge request weblogic-cloud/weblogic-kubernetes-operator!4286

Author: rjeberhard

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

@@ -4,14 +4,15 @@
 package oracle.kubernetes.operator.steps;
 
 import io.kubernetes.client.openapi.models.V1Job;
-import oracle.kubernetes.operator.DomainStatusUpdater;
 import oracle.kubernetes.operator.JobAwaiterStepFactory;
 import oracle.kubernetes.operator.JobWatcher;
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
 
+import static oracle.kubernetes.operator.DomainStatusUpdater.createRemoveFailuresStep;
+
 public class WatchDomainIntrospectorJobReadyStep extends Step {
 
   @Override
@@ -20,9 +21,9 @@ public NextAction apply(Packet packet) {
 
     if (hasNotCompleted(domainIntrospectorJob)) {
       JobAwaiterStepFactory jw = packet.getSpi(JobAwaiterStepFactory.class);
-      return doNext(jw.waitForReady(domainIntrospectorJob, getNext()), packet);
+      return doNext(jw.waitForReady(domainIntrospectorJob, createRemoveFailuresStep(getNext())), packet);
     } else {
-      return doNext(DomainStatusUpdater.createRemoveFailuresStep(getNext()), packet);
+      return doNext(createRemoveFailuresStep(getNext()), packet);
     }
   }
 

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

@@ -20,21 +20,28 @@
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.helpers.JobHelper;
 import oracle.kubernetes.operator.helpers.KubernetesTestSupport;
+import oracle.kubernetes.operator.steps.WatchDomainIntrospectorJobReadyStep;
 import oracle.kubernetes.operator.watcher.WatchListener;
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.operator.work.TerminalStep;
 import oracle.kubernetes.utils.SystemClock;
+import oracle.kubernetes.weblogic.domain.model.DomainCondition;
 import oracle.kubernetes.weblogic.domain.model.DomainResource;
 import oracle.kubernetes.weblogic.domain.model.DomainSpec;
+import oracle.kubernetes.weblogic.domain.model.DomainStatus;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static oracle.kubernetes.operator.DomainProcessorTestSetup.NS;
 import static oracle.kubernetes.operator.DomainProcessorTestSetup.UID;
 import static oracle.kubernetes.operator.JobWatcher.NULL_LISTENER;
+import static oracle.kubernetes.operator.KubernetesConstants.DOMAIN;
 import static oracle.kubernetes.operator.LabelConstants.CREATEDBYOPERATOR_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.DOMAINUID_LABEL;
+import static oracle.kubernetes.operator.ProcessingConstants.JOBWATCHER_COMPONENT_NAME;
+import static oracle.kubernetes.weblogic.domain.model.DomainConditionType.FAILED;
+import static oracle.kubernetes.weblogic.domain.model.DomainFailureReason.ABORTED;
 import static org.hamcrest.Matchers.both;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.instanceOf;
@@ -385,6 +392,16 @@ private void startWaitForReadyThenReadJob(Function<V1Job,V1Job> jobFunction, Ste
     }
   }
 
+  private void startWatchDomainIntrospectorJobReadyStep(Function<V1Job,V1Job> jobFunction) {
+    V1Job persistedJob = jobFunction.apply(createJob());
+    testSupport.defineResources(persistedJob);
+    testSupport.defineResources(domain);
+    testSupport.getPacket().put(ProcessingConstants.DOMAIN_INTROSPECTOR_JOB, this.dontChangeJob(persistedJob));
+    domain.getOrCreateStatus().addCondition(new DomainCondition(FAILED).withReason(ABORTED).withMessage("ugh"));
+
+    testSupport.runSteps(testSupport.getPacket(), new WatchDomainIntrospectorJobReadyStep());
+  }
+
   private void startWaitForReadyWithJobPodFluentdThenReadJob(Function<V1Job,V1Job> jobFunction) {
     AtomicBoolean stopping = new AtomicBoolean(false);
     JobWatcher watcher = createWatcher(stopping);
@@ -438,6 +455,18 @@ void whenReceivedCallbackForIncompleteJob_ignoreIt() {
     assertThat(terminalStep.wasRun(), is(false));
   }
 
+  @Test
+  void whenJobWithReady_performNextStep() {
+    testSupport.addComponent(JOBWATCHER_COMPONENT_NAME, JobAwaiterStepFactory.class, new JobAwaiterStepFactoryStub());
+    startWatchDomainIntrospectorJobReadyStep(this::dontChangeJob);
+
+    assertThat(getDomainStatus().hasConditionWithType(FAILED), is(false));
+  }
+
+  private DomainStatus getDomainStatus() {
+    return ((DomainResource)testSupport.getResources(DOMAIN).get(0)).getStatus();
+  }
+
   @SuppressWarnings("unused")
   private V1Job createCompletedJobWithDifferentTimestamp(V1Job job) {
     clock = clock.plusSeconds(1);
@@ -470,4 +499,11 @@ public void receivedEvents_areNotSentToListenersWhenWatchersPaused() {
     // Override as JobWatcher doesn't currently implement listener for callback
   }
 
+  private static class JobAwaiterStepFactoryStub implements JobAwaiterStepFactory {
+    @Override
+    public Step waitForReady(V1Job job, Step next) {
+      return next;
+    }
+  }
+
 }