wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

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

@@ -131,7 +131,7 @@ public synchronized void handleEvent(Event event) {
   }
 
   private void handleMarkedEventForResource(ResourceState state) {
-    if (state.deleteEventPresent() && !propagateAllEvent()) {
+    if (state.deleteEventPresent() && !triggerOnAllEvent()) {
       cleanupForDeletedEvent(state.getId());
     } else if (!state.processedMarkForDeletionPresent()) {
       submitReconciliationExecution(state);
@@ -145,7 +145,7 @@ private void submitReconciliationExecution(ResourceState state) {
       Optional<P> maybeLatest = cache.get(resourceID);
       maybeLatest.ifPresent(MDCUtils::addResourceInfo);
       if (!controllerUnderExecution
-          && (maybeLatest.isPresent() || (propagateAllEvent() && state.deleteEventPresent()))) {
+          && (maybeLatest.isPresent() || (triggerOnAllEvent() && state.deleteEventPresent()))) {
         var rateLimit = state.getRateLimit();
         if (rateLimit == null) {
           rateLimit = rateLimiter.initState();
@@ -158,8 +158,10 @@ private void submitReconciliationExecution(ResourceState state) {
         }
         state.setUnderProcessing(true);
         final var latest = maybeLatest.orElseGet(() -> getResourceFromState(state));
-        ExecutionScope<P> executionScope = new ExecutionScope<>(state.getRetry());
-        state.unMarkEventReceived(propagateAllEvent());
+        ExecutionScope<P> executionScope =
+            new ExecutionScope<>(
+                state.getRetry(), state.deleteEventPresent(), state.isDeleteFinalStateUnknown());
+        state.unMarkEventReceived(triggerOnAllEvent());
         metrics.reconcileCustomResource(latest, state.getRetry(), metricsMetadata);
         log.debug("Executing events for custom resource. Scope: {}", executionScope);
         executor.execute(new ReconcilerExecutor(resourceID, executionScope));
@@ -186,7 +188,7 @@ private void submitReconciliationExecution(ResourceState state) {
 
   @SuppressWarnings("unchecked")
   private P getResourceFromState(ResourceState state) {
-    if (propagateAllEvent()) {
+    if (triggerOnAllEvent()) {
       log.debug("Getting resource from state for {}", state.getId());
       return (P) state.getLastKnownResource();
     } else {
@@ -217,11 +219,11 @@ private void handleEventMarking(Event event, ResourceState state) {
         // removed, but also the informers websocket is disconnected and later reconnected. So
         // meanwhile the resource could be deleted and recreated. In this case we just mark a new
         // event as below.
-        state.markEventReceived(propagateAllEvent());
+        state.markEventReceived(triggerOnAllEvent());
       }
     } else if (!state.deleteEventPresent() && !state.processedMarkForDeletionPresent()) {
-      state.markEventReceived(propagateAllEvent());
-    } else if (propagateAllEvent() && state.deleteEventPresent()) {
+      state.markEventReceived(triggerOnAllEvent());
+    } else if (triggerOnAllEvent() && state.deleteEventPresent()) {
       state.markAdditionalEventAfterDeleteEvent();
     } else if (log.isDebugEnabled()) {
       log.debug(
@@ -264,21 +266,21 @@ synchronized void eventProcessingFinished(
     // Either way we don't want to retry.
     if (isRetryConfigured()
         && postExecutionControl.exceptionDuringExecution()
-        && (!state.deleteEventPresent() || propagateAllEvent())) {
+        && (!state.deleteEventPresent() || triggerOnAllEvent())) {
       handleRetryOnException(
           executionScope, postExecutionControl.getRuntimeException().orElseThrow());
       return;
     }
     cleanupOnSuccessfulExecution(executionScope);
     metrics.finishedReconciliation(executionScope.getResource(), metricsMetadata);
-    if ((propagateAllEvent() && executionScope.isDeleteEvent())
-        || (!propagateAllEvent() && state.deleteEventPresent())) {
+    if ((triggerOnAllEvent() && executionScope.isDeleteEvent())
+        || (!triggerOnAllEvent() && state.deleteEventPresent())) {
       cleanupForDeletedEvent(executionScope.getResourceID());
     } else if (postExecutionControl.isFinalizerRemoved()) {
       state.markProcessedMarkForDeletion();
       metrics.cleanupDoneFor(resourceID, metricsMetadata);
     } else {
-      if (state.eventPresent() || (propagateAllEvent() && state.deleteEventPresent())) {
+      if (state.eventPresent() || (triggerOnAllEvent() && state.deleteEventPresent())) {
         submitReconciliationExecution(state);
       } else {
         reScheduleExecutionIfInstructed(postExecutionControl, executionScope.getResource());
@@ -343,8 +345,8 @@ private void handleRetryOnException(ExecutionScope<P> executionScope, Exception
     var resourceID = state.getId();
     boolean eventPresent =
         state.eventPresent()
-            || (propagateAllEvent() && state.isAdditionalEventPresentAfterDeleteEvent());
-    state.markEventReceived(propagateAllEvent());
+            || (triggerOnAllEvent() && state.isAdditionalEventPresentAfterDeleteEvent());
+    state.markEventReceived(triggerOnAllEvent());
 
     retryAwareErrorLogging(state.getRetry(), eventPresent, exception, executionScope);
     if (eventPresent) {
@@ -488,7 +490,7 @@ public void run() {
       try {
         var actualResource = cache.get(resourceID);
         if (actualResource.isEmpty()) {
-          if (propagateAllEvent()) {
+          if (triggerOnAllEvent() && executionScope.isDeleteEvent()) {
             log.debug(
                 "Resource not found in the cache, checking for delete event resource: {}",
                 resourceID);
@@ -503,9 +505,6 @@ public void run() {
                   "Skipping execution; delete event resource not found in state: {}", resourceID);
               return;
             }
-            executionScope.setDeleteEvent(true);
-            executionScope.setDeleteFinalStateUnknown(
-                state.orElseThrow().isDeleteFinalStateUnknown());
           } else {
             log.debug("Skipping execution; primary resource missing from cache: {}", resourceID);
             return;
@@ -547,7 +546,7 @@ public synchronized boolean isRunning() {
   }
 
   // shortening
-  private boolean propagateAllEvent() {
+  private boolean triggerOnAllEvent() {
     return controllerConfiguration.triggerReconcilerOnAllEvent();
   }
 }

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

@@ -8,11 +8,13 @@ class ExecutionScope<R extends HasMetadata> {
   // the latest custom resource from cache
   private R resource;
   private final RetryInfo retryInfo;
-  private boolean deleteEvent = false;
-  private boolean isDeleteFinalStateUnknown = false;
+  private boolean deleteEvent;
+  private boolean isDeleteFinalStateUnknown;
 
-  ExecutionScope(RetryInfo retryInfo) {
+  ExecutionScope(RetryInfo retryInfo, boolean deleteEvent, boolean isDeleteFinalStateUnknown) {
     this.retryInfo = retryInfo;
+    this.deleteEvent = deleteEvent;
+    this.isDeleteFinalStateUnknown = isDeleteFinalStateUnknown;
   }
 
   public ExecutionScope<R> setResource(R resource) {

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

@@ -81,7 +81,7 @@ private PostExecutionControl<P> handleDispatch(ExecutionScope<P> executionScope)
         originalResource.getMetadata().getNamespace());
 
     final var markedForDeletion = originalResource.isMarkedForDeletion();
-    if (!propagateAllEvent()
+    if (!triggerOnAllEvent()
         && markedForDeletion
         && shouldNotDispatchToCleanupWhenMarkedForDeletion(originalResource)) {
       log.debug(
@@ -100,7 +100,7 @@ && shouldNotDispatchToCleanupWhenMarkedForDeletion(originalResource)) {
             executionScope.isDeleteFinalStateUnknown());
 
     // checking the cleaner for all-event-mode
-    if (!propagateAllEvent() && markedForDeletion) {
+    if (!triggerOnAllEvent() && markedForDeletion) {
       return handleCleanup(resourceForExecution, originalResource, context, executionScope);
     } else {
       return handleReconcile(executionScope, resourceForExecution, originalResource, context);
@@ -119,7 +119,7 @@ private PostExecutionControl<P> handleReconcile(
       P originalResource,
       Context<P> context)
       throws Exception {
-    if (!propagateAllEvent()
+    if (!triggerOnAllEvent()
         && controller.useFinalizer()
         && !originalResource.hasFinalizer(configuration().getFinalizerName())) {
       /*
@@ -288,7 +288,7 @@ private PostExecutionControl<P> handleCleanup(
     }
     DeleteControl deleteControl = controller.cleanup(resourceForExecution, context);
     final var useFinalizer = controller.useFinalizer();
-    if (useFinalizer && !propagateAllEvent()) {
+    if (useFinalizer && !triggerOnAllEvent()) {
       // note that we don't reschedule here even if instructed. Removing finalizer means that
       // cleanup is finished, nothing left to be done
       final var finalizerName = configuration().getFinalizerName();
@@ -535,7 +535,7 @@ private Resource<R> resource(R resource) {
     }
   }
 
-  private boolean propagateAllEvent() {
+  private boolean triggerOnAllEvent() {
     return configuration().triggerReconcilerOnAllEvent();
   }
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/TestUtils.java

@@ -32,6 +32,10 @@ public static TestCustomResource testCustomResource1() {
     return testCustomResource(new ResourceID("test1", "default"));
   }
 
+  public static ResourceID testCustomResource1Id() {
+    return new ResourceID("test1", "default");
+  }
+
   public static TestCustomResource testCustomResource(ResourceID id) {
     TestCustomResource resource = new TestCustomResource();
     resource.setMetadata(