wip

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSource.java

@@ -82,7 +82,11 @@ public synchronized void start() {
   }
 
   public void eventReceived(
-      ResourceAction action, T resource, T oldResource, Boolean deletedFinalStateUnknown) {
+      ResourceAction action,
+      T resource,
+      T oldResource,
+      Boolean deletedFinalStateUnknown,
+      boolean filterEvent) {
     try {
       if (log.isDebugEnabled()) {
         log.debug(
@@ -95,7 +99,7 @@ public void eventReceived(
       }
       MDCUtils.addResourceInfo(resource);
       controller.getEventSourceManager().broadcastOnResourceEvent(action, resource, oldResource);
-      if (isAcceptedByFilters(action, resource, oldResource)) {
+      if (isAcceptedByFilters(action, resource, oldResource) && !filterEvent) {
         if (deletedFinalStateUnknown != null) {
           getEventHandler()
               .handleEvent(
@@ -132,20 +136,21 @@ private boolean isAcceptedByFilters(ResourceAction action, T resource, T oldReso
 
   @Override
   public void onAdd(T resource) {
-    super.onAdd(resource);
-    eventReceived(ResourceAction.ADDED, resource, null, null);
+    var knownResourceVersion = temporaryResourceCache.onAddOrUpdateEvent(resource);
+    eventReceived(ResourceAction.ADDED, resource, null, null, knownResourceVersion);
   }
 
   @Override
   public void onUpdate(T oldCustomResource, T newCustomResource) {
-    super.onUpdate(oldCustomResource, newCustomResource);
-    eventReceived(ResourceAction.UPDATED, newCustomResource, oldCustomResource, null);
+    var knownResourceVersion = temporaryResourceCache.onAddOrUpdateEvent(newCustomResource);
+    eventReceived(
+        ResourceAction.UPDATED, newCustomResource, oldCustomResource, null, knownResourceVersion);
   }
 
   @Override
   public void onDelete(T resource, boolean deletedFinalStateUnknown) {
     super.onDelete(resource, deletedFinalStateUnknown);
-    eventReceived(ResourceAction.DELETED, resource, null, deletedFinalStateUnknown);
+    eventReceived(ResourceAction.DELETED, resource, null, deletedFinalStateUnknown, false);
   }
 
   @Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java

@@ -72,16 +72,6 @@ protected ManagedInformerEventSource(
     this.configuration = configuration;
   }
 
-  @Override
-  public void onAdd(R resource) {
-    temporaryResourceCache.onAddOrUpdateEvent(resource);
-  }
-
-  @Override
-  public void onUpdate(R oldObj, R newObj) {
-    temporaryResourceCache.onAddOrUpdateEvent(newObj);
-  }
-
   @Override
   public void onDelete(R obj, boolean deletedFinalStateUnknown) {
     temporaryResourceCache.onDeleteEvent(obj, deletedFinalStateUnknown);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSourceTest.java

@@ -68,35 +68,35 @@ void skipsEventHandlingIfGenerationNotIncreased() {
     TestCustomResource oldCustomResource = TestUtils.testCustomResource();
     oldCustomResource.getMetadata().setFinalizers(List.of(FINALIZER));
 
-    source.eventReceived(ResourceAction.UPDATED, customResource, oldCustomResource, null);
+    source.eventReceived(ResourceAction.UPDATED, customResource, oldCustomResource, null, false);
     verify(eventHandler, times(1)).handleEvent(any());
 
-    source.eventReceived(ResourceAction.UPDATED, customResource, customResource, null);
+    source.eventReceived(ResourceAction.UPDATED, customResource, customResource, null, false);
     verify(eventHandler, times(1)).handleEvent(any());
   }
 
   @Test
   void dontSkipEventHandlingIfMarkedForDeletion() {
     TestCustomResource customResource1 = TestUtils.testCustomResource();
 
-    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null);
+    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null, false);
     verify(eventHandler, times(1)).handleEvent(any());
 
     // mark for deletion
     customResource1.getMetadata().setDeletionTimestamp(LocalDateTime.now().toString());
-    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null);
+    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null, false);
     verify(eventHandler, times(2)).handleEvent(any());
   }
 
   @Test
   void normalExecutionIfGenerationChanges() {
     TestCustomResource customResource1 = TestUtils.testCustomResource();
 
-    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null);
+    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null, false);
     verify(eventHandler, times(1)).handleEvent(any());
 
     customResource1.getMetadata().setGeneration(2L);
-    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null);
+    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null, false);
     verify(eventHandler, times(2)).handleEvent(any());
   }
 
@@ -107,18 +107,18 @@ void handlesAllEventIfNotGenerationAware() {
 
     TestCustomResource customResource1 = TestUtils.testCustomResource();
 
-    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null);
+    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null, false);
     verify(eventHandler, times(1)).handleEvent(any());
 
-    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null);
+    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null, false);
     verify(eventHandler, times(2)).handleEvent(any());
   }
 
   @Test
   void eventWithNoGenerationProcessedIfNoFinalizer() {
     TestCustomResource customResource1 = TestUtils.testCustomResource();
 
-    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null);
+    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null, false);
 
     verify(eventHandler, times(1)).handleEvent(any());
   }
@@ -127,7 +127,7 @@ void eventWithNoGenerationProcessedIfNoFinalizer() {
   void callsBroadcastsOnResourceEvents() {
     TestCustomResource customResource1 = TestUtils.testCustomResource();
 
-    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null);
+    source.eventReceived(ResourceAction.UPDATED, customResource1, customResource1, null, false);
 
     verify(testController.getEventSourceManager(), times(1))
         .broadcastOnResourceEvent(
@@ -143,8 +143,8 @@ void filtersOutEventsOnAddAndUpdate() {
     source = new ControllerEventSource<>(new TestController(onAddFilter, onUpdatePredicate, null));
     setUpSource(source, true, controllerConfig);
 
-    source.eventReceived(ResourceAction.ADDED, cr, null, null);
-    source.eventReceived(ResourceAction.UPDATED, cr, cr, null);
+    source.eventReceived(ResourceAction.ADDED, cr, null, null, false);
+    source.eventReceived(ResourceAction.UPDATED, cr, cr, null, false);
 
     verify(eventHandler, never()).handleEvent(any());
   }
@@ -156,9 +156,9 @@ void genericFilterFiltersOutAddUpdateAndDeleteEvents() {
     source = new ControllerEventSource<>(new TestController(null, null, res -> false));
     setUpSource(source, true, controllerConfig);
 
-    source.eventReceived(ResourceAction.ADDED, cr, null, null);
-    source.eventReceived(ResourceAction.UPDATED, cr, cr, null);
-    source.eventReceived(ResourceAction.DELETED, cr, cr, true);
+    source.eventReceived(ResourceAction.ADDED, cr, null, null, false);
+    source.eventReceived(ResourceAction.UPDATED, cr, cr, null, false);
+    source.eventReceived(ResourceAction.DELETED, cr, cr, true, false);
 
     verify(eventHandler, never()).handleEvent(any());
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/filterpatchevent/FilterPatchEventIT.java

@@ -56,17 +56,14 @@ void patchEventFilteredWhenFlagIsTrue() {
 
     // Wait for the reconciliation to complete and the resource to be updated
     await()
-        .atMost(Duration.ofSeconds(5))
+        .pollDelay(Duration.ofMillis(POLL_DELAY))
         .untilAsserted(
             () -> {
               var updated = extension.get(FilterPatchEventTestCustomResource.class, NAME);
               assertThat(updated.getStatus()).isNotNull();
               assertThat(updated.getStatus().getValue()).isEqualTo(UPDATED);
             });
 
-    // Give some time for any potential additional reconciliations to occur
-    await().pollDelay(Duration.ofMillis(POLL_DELAY)).untilAsserted(() -> assertThat(true).isTrue());
-
     // With filterPatchEvent=true, reconciliation should only run once
     // (triggered by the initial create, but not by the patch operation)
     int executions = reconciler.getNumberOfExecutions();