OWLS109199 part 2 - Continue domain processing when spec changed even if there are retriable failures

Author: doxiao

operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java

@@ -389,10 +389,10 @@ private boolean shouldContinue(MakeRightDomainOperation operation, DomainPresenc
       return false;
     } else if (isDeleting(operation)) {
       return true;
-    } else if (liveInfo.isDomainProcessingHalted(cachedInfo)
-        || hasRetriableFailureNonRetryingOperation(operation, liveInfo)) {
+    } else if (liveInfo.isDomainProcessingHalted(cachedInfo)) {
       return false;
-    } else if (operation.isExplicitRecheck() || liveInfo.isDomainGenerationChanged(cachedInfo)) {
+    } else if (isExplicitRecheckWithoutRetriableFailure(operation, liveInfo)
+        || liveInfo.isDomainGenerationChanged(cachedInfo)) {
       return true;
     } else {
       cachedInfo.setDomain(liveInfo.getDomain());
@@ -415,6 +415,11 @@ private boolean shouldContinue(MakeRightClusterOperation operation, ClusterPrese
       return false;
     }
   }
+  
+  private boolean isExplicitRecheckWithoutRetriableFailure(
+      MakeRightDomainOperation operation, DomainPresenceInfo info) {
+    return operation.isExplicitRecheck() && !hasRetriableFailureNonRetryingOperation(operation, info);
+  }
 
   private boolean hasRetriableFailureNonRetryingOperation(MakeRightDomainOperation operation, DomainPresenceInfo info) {
     return info.hasRetriableFailure() && !operation.isRetryOnFailure();

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

@@ -424,7 +424,7 @@ void whenDomainChangedSpecWithForDeletion_dontGenerateDomainChangedEvent() {
   }
 
   @Test
-  void whenDomainWithRetriableFailureButNotRetrying_dontContinueProcessing() {
+  void whenDomainSpecNotChangedWithRetriableFailureButNotRetrying_dontContinueProcessing() {
     originalInfo.setPopulated(true);
     processor.registerDomainPresenceInfo(originalInfo);
     domain.getStatus().addCondition(new DomainCondition(FAILED).withReason(DOMAIN_INVALID));
@@ -434,6 +434,17 @@ void whenDomainWithRetriableFailureButNotRetrying_dontContinueProcessing() {
     assertThat(logRecords, containsFine(NOT_STARTING_DOMAINUID_THREAD));
   }
 
+  @Test
+  void whenDomainSpecChangedWithRetriableFailureButNotRetrying_continueProcessing() {
+    originalInfo.setPopulated(true);
+    processor.registerDomainPresenceInfo(originalInfo);
+    domain.getStatus().addCondition(new DomainCondition(FAILED).withReason(DOMAIN_INVALID));
+
+    processor.createMakeRightOperation(newInfo).withExplicitRecheck().execute();
+
+    assertThat(logRecords, not(containsFine(NOT_STARTING_DOMAINUID_THREAD)));
+  }
+
   @Test
   void whenDomainWithRetriableFailureButForDeletion_continueProcessing() {
     originalInfo.setPopulated(true);