fix: processor issue with cleanup resources (#2049)

* fix: processor issue with cleanup resources if leader election not running delete event was not cleaning up state Signed-off-by: Attila Mészáros <[email protected]> * revert small change Signed-off-by: Attila Mészáros <[email protected]> --------- Signed-off-by: Attila Mészáros <[email protected]>
operator-framework · Sep 8, 2023 · ddd7c42 · ddd7c42
1 parent 2aa8dfe
commit ddd7c42
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/...ework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java b/...ework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java
@@ -97,6 +97,9 @@ public synchronized void handleEvent(Event event) {
       metrics.receivedEvent(event, metricsMetadata);
       handleEventMarking(event, state);
       if (!this.running) {
+        if (state.deleteEventPresent()) {
+          cleanupForDeletedEvent(state.getId());
+        }
         // events are received and marked, but will be processed when started, see start() method.
         log.debug("Skipping event: {} because the event processor is not started", event);
         return;

diff --git a/...k-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java b/...k-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java
@@ -452,6 +452,21 @@ void executionOfReconciliationShouldNotStartIfProcessorStopped() throws Interrup
         .handleExecution(any());
   }
 
+  @Test
+  void cleansUpForDeleteEventEvenIfProcessorNotStarted() {
+    ResourceID resourceID = new ResourceID("test1", "default");
+
+    eventProcessor =
+        spy(new EventProcessor(controllerConfiguration(null, rateLimiterMock),
+            reconciliationDispatcherMock,
+            eventSourceManagerMock, null));
+
+    eventProcessor.handleEvent(prepareCREvent(resourceID));
+    eventProcessor.handleEvent(new ResourceEvent(ResourceAction.DELETED, resourceID, null));
+    eventProcessor.handleEvent(prepareCREvent(resourceID));
+    // no exception thrown
+  }
+
   private ResourceID eventAlreadyUnderProcessing() {
     when(reconciliationDispatcherMock.handleExecution(any()))
         .then(