Merge branch 'owls109199-avoid-repeated-processing' into 'main'

Owls109199 avoid accidental repeateded domain processing

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

Author: ddsharpe

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

@@ -385,8 +385,12 @@ private boolean shouldContinue(MakeRightDomainOperation operation, DomainPresenc
     final DomainPresenceInfo cachedInfo = getExistingDomainPresenceInfo(liveInfo);
     if (isNewDomain(cachedInfo)) {
       return true;
-    } else if (liveInfo.isFromOutOfDateEvent(operation, cachedInfo)
-        || liveInfo.isDomainProcessingHalted(cachedInfo)) {
+    } else if (liveInfo.isFromOutOfDateEvent(operation, cachedInfo)) {
+      return false;
+    } else if (isDeleting(operation)) {
+      return true;
+    } else if (liveInfo.isDomainProcessingHalted(cachedInfo)
+        || hasRetriableFailureNonRetryingOperation(operation, liveInfo)) {
       return false;
     } else if (operation.isExplicitRecheck() || liveInfo.isDomainGenerationChanged(cachedInfo)) {
       return true;
@@ -398,7 +402,7 @@ private boolean shouldContinue(MakeRightDomainOperation operation, DomainPresenc
 
   private boolean shouldContinue(MakeRightClusterOperation operation, ClusterPresenceInfo liveInfo) {
     final ClusterPresenceInfo cachedInfo = getExistingClusterPresenceInfo(liveInfo);
-    if (hasDeletedClusterEventData(operation)) {
+    if (isDeleting(operation)) {
       return findClusterPresenceInfo(liveInfo.getNamespace(), liveInfo.getResourceName());
     } else if (isNewCluster(cachedInfo)) {
       return true;
@@ -412,6 +416,10 @@ private boolean shouldContinue(MakeRightClusterOperation operation, ClusterPrese
     }
   }
 
+  private boolean hasRetriableFailureNonRetryingOperation(MakeRightDomainOperation operation, DomainPresenceInfo info) {
+    return info.hasRetriableFailure() && !operation.isRetryOnFailure();
+  }
+
   private boolean isNewDomain(DomainPresenceInfo cachedInfo) {
     return Optional.ofNullable(cachedInfo).map(DomainPresenceInfo::getDomain).orElse(null) == null;
   }
@@ -424,11 +432,15 @@ private boolean findClusterPresenceInfo(String namespace, String clusterName) {
     return Optional.ofNullable(clusters.get(namespace)).orElse(Collections.emptyMap()).get(clusterName) != null;
   }
 
-  private boolean hasDeletedClusterEventData(MakeRightClusterOperation operation) {
+  private boolean isDeleting(MakeRightClusterOperation operation) {
     return EventItem.CLUSTER_DELETED == getEventItem(operation);
   }
 
-  private EventItem getEventItem(MakeRightClusterOperation operation) {
+  private boolean isDeleting(MakeRightDomainOperation operation) {
+    return operation.isDeleting() || EventItem.DOMAIN_DELETED == getEventItem(operation);
+  }
+
+  private EventItem getEventItem(MakeRightOperation operation) {
     return Optional.ofNullable(operation.getEventData()).map(EventData::getItem).orElse(null);
   }
 
@@ -644,7 +656,7 @@ public void updateDomainStatus(@Nonnull V1PersistentVolumeClaim pvc, DomainPrese
   }
 
   private String getPhase(@Nonnull V1PersistentVolumeClaim pvc) {
-    return Optional.ofNullable(pvc).map(V1PersistentVolumeClaim::getStatus)
+    return Optional.of(pvc).map(V1PersistentVolumeClaim::getStatus)
         .map(V1PersistentVolumeClaimStatus::getPhase).orElse(null);
   }
 

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

@@ -272,8 +272,7 @@ private boolean isStranded(DomainPresenceInfo dpi) {
   private static void removeStrandedDomainPresenceInfo(DomainProcessor dp, DomainPresenceInfo info) {
     info.setDeleting(true);
     info.setPopulated(true);
-    dp.createMakeRightOperation(info).withExplicitRecheck().forDeletion().withEventData(new EventData(
-        EventItem.DOMAIN_DELETED)).execute();
+    dp.createMakeRightOperation(info).withExplicitRecheck().forDeletion().execute();
   }
 
   private Stream<DomainPresenceInfo> getActiveDomainPresenceInfos() {
@@ -289,9 +288,10 @@ private void activateDomain(DomainProcessor dp, DomainPresenceInfo info) {
     EventItem eventItem = getEventItem(info);
     MakeRightDomainOperation makeRight = dp.createMakeRightOperation(info).withExplicitRecheck();
     if (eventItem != null) {
-      makeRight.withEventData(new EventData(eventItem)).interrupt();
+      makeRight.withEventData(new EventData(eventItem)).interrupt().execute();
+    } else if (!info.hasRetriableFailure()) {
+      makeRight.execute();
     }
-    makeRight.execute();
   }
 
   private EventItem getEventItem(DomainPresenceInfo info) {

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

@@ -201,7 +201,7 @@ private boolean wasNotRolling() {
   /**
    * Creates an asynchronous step to initialize the domain status, if needed, to indicate that the operator has
    * seen the domain and is now working on it.
-   * @param hasEventData tue if the make right operation is associated with an event data
+   * @param hasEventData true if the make right operation is associated with an event.
    */
   public static Step createStatusInitializationStep(boolean hasEventData) {
     return new StatusInitializationStep(hasEventData);
@@ -603,7 +603,7 @@ void addDomainEvent(DomainCondition condition) {
   }
 
   public static class StatusInitializationStep extends DomainStatusUpdaterStep {
-    private boolean hasEventData;
+    private final boolean hasEventData;
 
     StatusInitializationStep(boolean hasEventData) {
       super();

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

@@ -10,6 +10,7 @@
  * Defines the operation to log a ClusterCreated/Changed/Deleted event.
  */
 public interface MakeRightClusterOperation extends MakeRightOperation<ClusterPresenceInfo> {
+
   /**
    * Set the event data that is associated with this operation.
    *
@@ -26,11 +27,4 @@ public interface MakeRightClusterOperation extends MakeRightOperation<ClusterPre
   MakeRightClusterOperation interrupt();
 
   MakeRightClusterOperation withExplicitRecheck();
-
-  /**
-   * Get the event data associated with this make-right operation.
-   *
-   * @return the event data.
-   */
-  EventHelper.EventData getEventData();
 }

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

@@ -44,8 +44,17 @@ public interface MakeRightDomainOperation extends MakeRightOperation<DomainPrese
    */
   MakeRightDomainOperation interrupt();
 
+  /**
+   * Modifies the factory to indicate that this is a retry operation on a retriable failure.
+   +
+   + @return the updated factory
+   */
+  MakeRightDomainOperation retryOnFailure();
+
   boolean isDeleting();
 
+  boolean isRetryOnFailure();
+
   void setInspectionRun();
 
   void setLiveInfo(@Nonnull DomainPresenceInfo info);
@@ -99,5 +108,4 @@ static Step createStepsToRerunWithIntrospection(Packet packet) {
   static Optional<MakeRightDomainOperation> fromPacket(Packet packet) {
     return Optional.ofNullable(packet.getValue(MAKE_RIGHT_DOMAIN_OPERATION));
   }
-
 }

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

@@ -5,6 +5,7 @@
 
 import javax.annotation.Nonnull;
 
+import oracle.kubernetes.operator.helpers.EventHelper;
 import oracle.kubernetes.operator.helpers.ResourcePresenceInfo;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.PacketComponent;
@@ -15,6 +16,7 @@
  * or to log a ClusterCreated/Changed/Deleted event.
  */
 public interface MakeRightOperation<T extends ResourcePresenceInfo> extends PacketComponent {
+
   void execute();
 
   @Nonnull
@@ -28,5 +30,12 @@ public interface MakeRightOperation<T extends ResourcePresenceInfo> extends Pack
 
   boolean hasEventData();
 
+  /**
+   * Get the event data associated with this make-right operation.
+   *
+   * @return the event data.
+   */
+  EventHelper.EventData getEventData();
+
   boolean isExplicitRecheck();
 }

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

@@ -1049,6 +1049,10 @@ public Collection<ClusterResource> getClusterResources() {
     return clusters.values();
   }
 
+  public boolean hasRetriableFailure() {
+    return Optional.ofNullable(getDomain()).map(DomainResource::hasRetriableFailure).orElse(false);
+  }
+
   /** Details about a specific managed server. */
   public static class ServerInfo {
     public final WlsServerConfig serverConfig;

operator/src/main/java/oracle/kubernetes/operator/makeright/MakeRightClusterOperationImpl.java

@@ -14,6 +14,7 @@
 import oracle.kubernetes.operator.helpers.ClusterPresenceInfo;
 import oracle.kubernetes.operator.helpers.EventHelper;
 import oracle.kubernetes.operator.helpers.EventHelper.ClusterResourceEventData;
+import oracle.kubernetes.operator.helpers.EventHelper.EventData;
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
@@ -105,7 +106,7 @@ private boolean isDeleting() {
   }
 
   private EventHelper.EventItem getEventItem() {
-    return Optional.ofNullable(getEventData()).map(EventHelper.EventData::getItem).orElse(null);
+    return Optional.ofNullable(getEventData()).map(EventData::getItem).orElse(null);
   }
 
   @Override
@@ -123,11 +124,6 @@ public boolean isExplicitRecheck() {
     return explicitRecheck;
   }
 
-  @Override
-  public EventHelper.EventData getEventData() {
-    return eventData;
-  }
-
   class StartPlanStep extends Step {
 
     private final ClusterPresenceInfo info;

operator/src/main/java/oracle/kubernetes/operator/makeright/MakeRightDomainOperationImpl.java

@@ -43,6 +43,8 @@
 import oracle.kubernetes.operator.helpers.PodHelper;
 import oracle.kubernetes.operator.helpers.ResponseStep;
 import oracle.kubernetes.operator.helpers.ServiceHelper;
+import oracle.kubernetes.operator.logging.LoggingFacade;
+import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.steps.DefaultResponseStep;
 import oracle.kubernetes.operator.steps.DeleteDomainStep;
 import oracle.kubernetes.operator.steps.ManagedServersUpStep;
@@ -61,15 +63,18 @@
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_STATE_LABEL;
 import static oracle.kubernetes.operator.ProcessingConstants.DOMAIN_INTROSPECT_REQUESTED;
 import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_DELETED;
+import static oracle.kubernetes.operator.helpers.EventHelper.createEventStep;
 
 /**
  * A factory which creates and executes steps to align the cached domain status with the value read from Kubernetes.
  */
 public class MakeRightDomainOperationImpl extends MakeRightOperationImpl<DomainPresenceInfo>
     implements MakeRightDomainOperation {
 
-  private boolean deleting;
+  public static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
+
   private boolean inspectionRun;
+  private boolean retryOnFailure;
 
   /**
    * Create the operation.
@@ -93,7 +98,7 @@ private MakeRightDomainOperation cloneWith(@Nonnull DomainPresenceInfo presenceI
   @Override
   public MakeRightDomainOperation createRetry(@Nonnull DomainPresenceInfo presenceInfo) {
     presenceInfo.setPopulated(false);
-    return cloneWith(presenceInfo).withExplicitRecheck();
+    return cloneWith(presenceInfo).withExplicitRecheck().retryOnFailure();
   }
 
   /**
@@ -141,6 +146,12 @@ public MakeRightDomainOperation interrupt() {
     return this;
   }
 
+  @Override
+  public MakeRightDomainOperation retryOnFailure() {
+    this.retryOnFailure = true;
+    return this;
+  }
+
   @Override
   public boolean isDeleting() {
     return deleting;
@@ -151,6 +162,11 @@ public boolean isExplicitRecheck() {
     return explicitRecheck;
   }
 
+  @Override
+  public boolean isRetryOnFailure() {
+    return retryOnFailure;
+  }
+
   @Override
   public void execute() {
     executor.runMakeRight(this);
@@ -213,12 +229,13 @@ private String getNamespace() {
   public Step createSteps() {
     final List<Step> result = new ArrayList<>();
 
-    result.add(Optional.ofNullable(eventData).map(EventHelper::createEventStep).orElse(null));
-    result.add(new DomainProcessorImpl.PopulatePacketServerMapsStep());
-    result.add(createStatusInitializationStep(hasEventData()));
+    result.add(new UpdateDomainPresenceInfoStep(liveInfo));
     if (deleting || domainHasDeletionTimestamp()) {
       result.add(new StartPlanStep(liveInfo, createDomainDownPlan()));
     } else {
+      result.add(getCreateEventStep());
+      result.add(new DomainProcessorImpl.PopulatePacketServerMapsStep());
+      result.add(createStatusInitializationStep(hasEventData()));
       result.add(createListClusterResourcesStep(getNamespace()));
       result.add(createDomainValidationStep(getDomain()));
       result.add(new StartPlanStep(liveInfo, createDomainUpPlan(liveInfo)));
@@ -258,12 +275,8 @@ private boolean isForDomain(ClusterResource clusterResource, DomainPresenceInfo
   }
 
   private Step createDomainDownPlan() {
-    Step eventStep = null;
-    if (Optional.ofNullable(eventData).map(e -> e.getItem() != DOMAIN_DELETED).orElse(true)) {
-      eventStep = EventHelper.createEventStep(new EventData(DOMAIN_DELETED));
-    }
     return Step.chain(
-        eventStep,
+        createEventStep(new EventData(DOMAIN_DELETED)),
         new DeleteDomainStep(),
         new UnregisterStatusUpdaterStep(),
         new UnregisterEventK8SObjectsStep());
@@ -311,6 +324,10 @@ private Step createDomainUpPlan(DomainPresenceInfo info) {
     return new UpHeadStep(introspectionAndDomainPresenceSteps);
   }
 
+  private Step getCreateEventStep() {
+    return Optional.ofNullable(eventData).map(EventHelper::createEventStep).orElse(null);
+  }
+
   static Step domainIntrospectionSteps() {
     return Step.chain(
         ConfigMapHelper.readIntrospectionVersionStep(),
@@ -408,12 +425,12 @@ public NextAction apply(Packet packet) {
     }
   }
 
-  class StartPlanStep extends Step {
+  class UpdateDomainPresenceInfoStep extends Step {
 
     private final DomainPresenceInfo info;
 
-    StartPlanStep(DomainPresenceInfo info, Step next) {
-      super(next);
+    UpdateDomainPresenceInfoStep(DomainPresenceInfo info) {
+      super();
       this.info = info;
     }
 
@@ -424,7 +441,22 @@ public NextAction apply(Packet packet) {
       } else {
         executor.registerDomainPresenceInfo(info);
       }
+      return doNext(packet);
+    }
+  }
+
+
+  class StartPlanStep extends Step {
+
+    private final DomainPresenceInfo info;
 
+    StartPlanStep(DomainPresenceInfo info, Step next) {
+      super(next);
+      this.info = info;
+    }
+
+    @Override
+    public NextAction apply(Packet packet) {
       return doNext(getNextSteps(), packet);
     }
 

operator/src/main/java/oracle/kubernetes/operator/makeright/MakeRightOperationImpl.java

@@ -16,6 +16,7 @@
 public abstract class MakeRightOperationImpl<T extends ResourcePresenceInfo> implements MakeRightOperation<T> {
   protected T liveInfo;
   protected boolean willInterrupt;
+  protected boolean deleting;
   protected EventData eventData;
 
   protected final MakeRightExecutor executor;
@@ -41,4 +42,9 @@ public boolean isWillInterrupt() {
   public boolean hasEventData() {
     return eventData != null;
   }
+
+  public EventData getEventData() {
+    return eventData;
+  }
+
 }