wip

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetry.java

@@ -10,10 +10,10 @@ public class GenericRetry implements Retry, AnnotationConfigurable<GradualRetry>
   private double intervalMultiplier = GradualRetry.DEFAULT_MULTIPLIER;
   private long maxInterval = GradualRetry.DEFAULT_MAX_INTERVAL;
 
-  public static final Retry DEFAULT = new GenericRetry();
+  public static final GenericRetry DEFAULT = new GenericRetry();
 
   public static GenericRetry defaultLimitedExponentialRetry() {
-    return (GenericRetry) DEFAULT;
+    return DEFAULT;
   }
 
   public static GenericRetry noRetry() {

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

@@ -598,10 +598,66 @@ void triggerOnAllEventRetriesDeleteEventError() {
   }
 
   @Test
-  void processesAdditionalEventWhileInDeleteModeRetry() {}
+  void processesAdditionalEventWhileInDeleteModeRetry() {
+    when(eventSourceManagerMock.retryEventSource()).thenReturn(mock(TimerEventSource.class));
+    eventProcessor =
+        spy(
+            new EventProcessor(
+                controllerConfigTriggerAllEvent(
+                    GenericRetry.DEFAULT.setInitialInterval(1000).setMaxAttempts(-1),
+                    rateLimiterMock),
+                reconciliationDispatcherMock,
+                eventSourceManagerMock,
+                null));
+    when(reconciliationDispatcherMock.handleExecution(any()))
+        .thenReturn(PostExecutionControl.defaultDispatch())
+        .thenReturn(PostExecutionControl.exceptionDuringExecution(new RuntimeException()));
+
+    eventProcessor.start();
+
+    eventProcessor.handleEvent(prepareCREvent1());
+    waitUntilProcessingFinished(eventProcessor, TestUtils.testCustomResource1Id());
+    eventProcessor.handleEvent(prepareCRDeleteEvent1());
+    verify(reconciliationDispatcherMock, times(2)).handleExecution(any());
+    waitUntilProcessingFinished(eventProcessor, TestUtils.testCustomResource1Id());
+    // retry event
+    eventProcessor.handleEvent(new Event(TestUtils.testCustomResource1Id()));
+    waitUntilProcessingFinished(eventProcessor, TestUtils.testCustomResource1Id());
+    verify(reconciliationDispatcherMock, times(3)).handleExecution(any());
+  }
 
   @Test
-  void triggerOnAllEventIfNoRetryInCleanupOnError() {}
+  void afterRetryExhaustedAdditionalEventTriggerReconciliationWhenDeleteEventPresent() {
+    when(eventSourceManagerMock.retryEventSource()).thenReturn(mock(TimerEventSource.class));
+    eventProcessor =
+        spy(
+            new EventProcessor(
+                controllerConfigTriggerAllEvent(
+                    GenericRetry.DEFAULT
+                        .setInitialInterval(100)
+                        .setIntervalMultiplier(1)
+                        .setMaxAttempts(1),
+                    rateLimiterMock),
+                reconciliationDispatcherMock,
+                eventSourceManagerMock,
+                null));
+    when(reconciliationDispatcherMock.handleExecution(any()))
+        .thenReturn(PostExecutionControl.defaultDispatch())
+        .thenReturn(PostExecutionControl.exceptionDuringExecution(new RuntimeException()));
+    eventProcessor.start();
+
+    eventProcessor.handleEvent(prepareCREvent1());
+    waitUntilProcessingFinished(eventProcessor, TestUtils.testCustomResource1Id());
+    eventProcessor.handleEvent(prepareCRDeleteEvent1());
+    waitUntilProcessingFinished(eventProcessor, TestUtils.testCustomResource1Id());
+    eventProcessor.handleEvent(new Event(TestUtils.testCustomResource1Id()));
+    await()
+        .untilAsserted(() -> verify(reconciliationDispatcherMock, times(3)).handleExecution(any()));
+
+    eventProcessor.handleEvent(new Event(TestUtils.testCustomResource1Id()));
+    waitUntilProcessingFinished(eventProcessor, TestUtils.testCustomResource1Id());
+    verify(reconciliationDispatcherMock, times(4)).handleExecution(any());
+  }
 
   @Test
   void passesResourceFromStateToDispatcher() {