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

@@ -217,10 +217,10 @@ 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();
+        state.markEventReceived(isAllEventMode());
       }
     } else if (!state.deleteEventPresent() && !state.processedMarkForDeletionPresent()) {
-      state.markEventReceived();
+      state.markEventReceived(isAllEventMode());
     } else if (isAllEventMode() && state.deleteEventPresent()) {
       state.markAdditionalEventAfterDeleteEvent();
     } else if (log.isDebugEnabled()) {
@@ -344,7 +344,7 @@ private void handleRetryOnException(ExecutionScope<P> executionScope, Exception
     boolean eventPresent =
         state.eventPresent()
             || (isAllEventMode() && state.isAdditionalEventPresentAfterDeleteEvent());
-    state.markEventReceived();
+    state.markEventReceived(isAllEventMode());
 
     retryAwareErrorLogging(state.getRetry(), eventPresent, exception, executionScope);
     if (eventPresent) {

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

@@ -93,12 +93,16 @@ public boolean processedMarkForDeletionPresent() {
     return eventing == EventingState.PROCESSED_MARK_FOR_DELETION;
   }
 
-  public void markEventReceived() {
-    if (deleteEventPresent()) {
+  public void markEventReceived(boolean isAllEventMode) {
+    if (!isAllEventMode && deleteEventPresent()) {
       throw new IllegalStateException("Cannot receive event after a delete event received");
     }
     log.debug("Marking event received for: {}", getId());
-    eventing = EventingState.EVENT_PRESENT;
+    if (eventing == EventingState.DELETE_EVENT_PRESENT) {
+      eventing = EventingState.ADDITIONAL_EVENT_PRESENT_AFTER_DELETE_EVENT;
+    } else {
+      eventing = EventingState.EVENT_PRESENT;
+    }
   }
 
   public void markAdditionalEventAfterDeleteEvent() {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/ResourceStateManagerTest.java

@@ -36,7 +36,7 @@ public void returnsNoEventPresentIfNotMarkedYet() {
 
   @Test
   public void marksEvent() {
-    state.markEventReceived();
+    state.markEventReceived(false);
 
     assertThat(state.eventPresent()).isTrue();
     assertThat(state.deleteEventPresent()).isFalse();
@@ -52,7 +52,7 @@ public void marksDeleteEvent() {
 
   @Test
   public void afterDeleteEventMarkEventIsNotRelevant() {
-    state.markEventReceived();
+    state.markEventReceived(false);
 
     state.markDeleteEventReceived(TestUtils.testCustomResource(), true);
 
@@ -62,7 +62,7 @@ public void afterDeleteEventMarkEventIsNotRelevant() {
 
   @Test
   public void cleansUp() {
-    state.markEventReceived();
+    state.markEventReceived(false);
     state.markDeleteEventReceived(TestUtils.testCustomResource(), true);
 
     manager.remove(sampleResourceID);
@@ -78,14 +78,14 @@ public void cannotMarkEventAfterDeleteEventReceived() {
         IllegalStateException.class,
         () -> {
           state.markDeleteEventReceived(TestUtils.testCustomResource(), true);
-          state.markEventReceived();
+          state.markEventReceived(false);
         });
   }
 
   @Test
   public void listsResourceIDSWithEventsPresent() {
-    state.markEventReceived();
-    state2.markEventReceived();
+    state.markEventReceived(false);
+    state2.markEventReceived(false);
     state.unMarkEventReceived(false);
 
     var res = manager.resourcesWithEventPresent();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/onlyreconcile/AllEventIT.java

@@ -1,6 +1,5 @@
 package io.javaoperatorsdk.operator.baseapi.alleventmode.onlyreconcile;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -63,7 +62,6 @@ void deleteEventPresentWithoutFinalizer() {
             });
   }
 
-  @Disabled("fix")
   @Test
   void retriesExceptionOnDeleteEvent() {
     var reconciler = extension.getReconcilerOfType(AllEventReconciler.class);