wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java

@@ -123,7 +123,7 @@ public synchronized void handleEvent(Event event) {
   }
 
   private void handleMarkedEventForResource(ResourceState state) {
-    if (state.deleteEventPresent() && !controllerConfiguration.isAllEventReconcileMode()) {
+    if (state.deleteEventPresent() && !isAllEventMode()) {
       cleanupForDeletedEvent(state.getId());
     } else if (!state.processedMarkForDeletionPresent()) {
       submitReconciliationExecution(state);
@@ -150,7 +150,7 @@ private void submitReconciliationExecution(ResourceState state) {
         state.setUnderProcessing(true);
         final var latest = maybeLatest.get();
         ExecutionScope<P> executionScope = new ExecutionScope<>(state.getRetry());
-        state.unMarkEventReceived(controllerConfiguration.isAllEventReconcileMode());
+        state.unMarkEventReceived(isAllEventMode());
         metrics.reconcileCustomResource(latest, state.getRetry(), metricsMetadata);
         log.debug("Executing events for custom resource. Scope: {}", executionScope);
         executor.execute(new ReconcilerExecutor(resourceID, executionScope));
@@ -201,7 +201,7 @@ private void handleEventMarking(Event event, ResourceState state) {
       }
     } else if (!state.deleteEventPresent() && !state.processedMarkForDeletionPresent()) {
       state.markEventReceived();
-    } else if (controllerConfiguration.isAllEventReconcileMode() && state.deleteEventPresent()) {
+    } else if (isAllEventMode() && state.deleteEventPresent()) {
       state.markAdditionalEventAfterDeleteEvent();
     } else if (log.isDebugEnabled()) {
       log.debug(
@@ -244,15 +244,15 @@ synchronized void eventProcessingFinished(
     // Either way we don't want to retry.
     if (isRetryConfigured()
         && postExecutionControl.exceptionDuringExecution()
-        && (!state.deleteEventPresent() || controllerConfiguration.isAllEventReconcileMode())) {
+        && (!state.deleteEventPresent() || isAllEventMode())) {
       handleRetryOnException(
           executionScope, postExecutionControl.getRuntimeException().orElseThrow());
       return;
     }
     cleanupOnSuccessfulExecution(executionScope);
     metrics.finishedReconciliation(executionScope.getResource(), metricsMetadata);
-    if ((controllerConfiguration.isAllEventReconcileMode() && executionScope.isDeleteEvent())
-        || (!controllerConfiguration.isAllEventReconcileMode() && state.deleteEventPresent())) {
+    if ((isAllEventMode() && executionScope.isDeleteEvent())
+        || (!isAllEventMode() && state.deleteEventPresent())) {
       cleanupForDeletedEvent(executionScope.getResourceID());
     } else if (postExecutionControl.isFinalizerRemoved()) {
       state.markProcessedMarkForDeletion();
@@ -321,7 +321,9 @@ TimerEventSource<P> retryEventSource() {
   private void handleRetryOnException(ExecutionScope<P> executionScope, Exception exception) {
     final var state = getOrInitRetryExecution(executionScope);
     var resourceID = state.getId();
-    boolean eventPresent = state.eventPresent();
+    boolean eventPresent =
+        state.eventPresent()
+            || (isAllEventMode() && state.isAdditionalEventPresentAfterDeleteEvent());
     state.markEventReceived();
 
     retryAwareErrorLogging(state.getRetry(), eventPresent, exception, executionScope);
@@ -466,7 +468,7 @@ public void run() {
       try {
         var actualResource = cache.get(resourceID);
         if (actualResource.isEmpty()) {
-          if (controllerConfiguration.isAllEventReconcileMode()) {
+          if (isAllEventMode()) {
             log.debug(
                 "Resource not found in the cache, checking for delete event resource: {}",
                 resourceID);
@@ -521,4 +523,9 @@ public synchronized boolean isUnderProcessing(ResourceID resourceID) {
   public synchronized boolean isRunning() {
     return running;
   }
+
+  // shortening
+  private boolean isAllEventMode() {
+    return controllerConfiguration.isAllEventReconcileMode();
+  }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ResourceState.java

@@ -85,6 +85,10 @@ public boolean deleteEventPresent() {
         || eventing == EventingState.ADDITIONAL_EVENT_PRESENT_AFTER_DELETE_EVENT;
   }
 
+  public boolean isAdditionalEventPresentAfterDeleteEvent() {
+    return eventing == EventingState.ADDITIONAL_EVENT_PRESENT_AFTER_DELETE_EVENT;
+  }
+
   public boolean processedMarkForDeletionPresent() {
     return eventing == EventingState.PROCESSED_MARK_FOR_DELETION;
   }