wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

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

@@ -127,9 +127,6 @@ public synchronized void onDelete(R resource, boolean deletedFinalStateUnknown)
           if (resultEvent.isEmpty()) {
             return;
           }
-          if (resultEvent.orElseThrow().getAction() != ResourceAction.DELETED) {
-            log.warn("Non delete event received on onDelete handling. This should not happen.");
-          }
           primaryToSecondaryIndex.onDelete(resource);
           if (acceptedByDeleteFilters(resource, deletedFinalStateUnknown)) {
             propagateEvent(resource);
@@ -140,6 +137,12 @@ public synchronized void onDelete(R resource, boolean deletedFinalStateUnknown)
   @Override
   protected void handleEvent(
       ResourceAction action, R resource, R oldResource, Boolean deletedFinalStateUnknown) {
+    // this is called only from ManagedInformerEventSource#eventFilteringUpdateAndCacheResource
+    // we want to skip delete when the delete event filtered out, but update the index if
+    // an actual event is propagated
+    if (action == ResourceAction.DELETED) {
+      primaryToSecondaryIndex.onDelete(resource);
+    }
     propagateEvent(resource);
   }
 
@@ -154,6 +157,7 @@ public synchronized void start() {
     manager().list().forEach(primaryToSecondaryIndex::onAddOrUpdate);
   }
 
+  @SuppressWarnings("unchecked")
   private synchronized void onAddOrUpdate(ResourceAction action, R newObject, R oldObject) {
     primaryToSecondaryIndex.onAddOrUpdate(newObject);
     var resourceID = ResourceID.fromResource(newObject);
@@ -167,11 +171,7 @@ private synchronized void onAddOrUpdate(ResourceAction action, R newObject, R ol
           "Propagating event for {}, resource with same version not result of a our update.",
           action);
       var event = resultEvent.get();
-      handleEvent(
-          event.getAction(),
-          (R) event.getResource().orElseThrow(),
-          (R) event.getPreviousResource().orElse(null),
-          event.getLastStateUnknow());
+      propagateEvent((R) event.getResource().orElseThrow());
     } else {
       log.debug("Event filtered out for operation: {}, resourceID: {}", action, resourceID);
     }

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

@@ -153,9 +153,9 @@ public void onList(String resourceVersion, boolean remainedEmpty) {
 
   //  @Override (enable when
   //  re-list supported by fabric8 client https://github.com/fabric8io/kubernetes-client/pull/7899
-  public void onBeforeList(String lastSyncResourceVersion) {
-    //    temporaryResourceCache.setOngoingRelist(lastSyncResourceVersion);
-  }
+  //  public void onBeforeList(String lastSyncResourceVersion) {
+  //    temporaryResourceCache.setOngoingRelist(lastSyncResourceVersion);
+  //  }
 
   @Override
   public void handleRecentResourceUpdate(

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSourceTest.java

@@ -15,6 +15,7 @@
  */
 package io.javaoperatorsdk.operator.processing.event.source.informer;
 
+import java.lang.reflect.Field;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
@@ -224,11 +225,11 @@ void eventReceivedAfterFailedUpdate_isPropagatedNormally() {
 
     CountDownLatch latch = sendForExceptionThrowingUpdate();
     latch.countDown();
+    var deployment = deploymentWithResourceVersion(2);
 
-    informerEventSource.onUpdate(
-        deploymentWithResourceVersion(1), deploymentWithResourceVersion(2));
+    informerEventSource.onUpdate(deploymentWithResourceVersion(1), deployment);
 
-    expectHandleUpdateEvent(2, 1);
+    expectPropagateEvent(deployment);
   }
 
   @Test
@@ -541,13 +542,59 @@ void deleteEventDuringOwnUpdateIsPropagated() {
         .untilAsserted(() -> verify(eventHandlerMock, atLeastOnce()).handleEvent(any()));
   }
 
+  @Test
+  void handleEventUpdatesIndexWhenDeletePropagatesFromTempCache() throws Exception {
+    // handleEvent is invoked from ManagedInformerEventSource#eventFilteringUpdateAndCacheResource
+    // only after the temp cache decided to surface the event. For a DELETE that means the resource
+    // is really gone and the secondary→primary index must drop it; otherwise stale entries linger
+    // and getSecondaryResources keeps returning a tombstone.
+    var indexMock = injectIndexMock();
+    var resource = testDeployment();
+
+    informerEventSource.handleEvent(ResourceAction.DELETED, resource, null, false);
+
+    verify(indexMock, times(1)).onDelete(resource);
+    verify(indexMock, never()).onAddOrUpdate(any());
+    verify(eventHandlerMock, times(1)).handleEvent(any());
+  }
+
+  @Test
+  void handleEventDoesNotTouchIndexForNonDeleteAction() throws Exception {
+    // The onAdd/onUpdate path maintains the index in onAddOrUpdate(); handleEvent must not
+    // double-update it for non-DELETE actions, otherwise we'd index resources twice.
+    var indexMock = injectIndexMock();
+
+    informerEventSource.handleEvent(
+        ResourceAction.UPDATED, testDeployment(), testDeployment(), null);
+
+    verify(indexMock, never()).onDelete(any());
+    verify(indexMock, never()).onAddOrUpdate(any());
+    verify(eventHandlerMock, times(1)).handleEvent(any());
+  }
+
+  private PrimaryToSecondaryIndex<Deployment> injectIndexMock() throws Exception {
+    @SuppressWarnings("unchecked")
+    PrimaryToSecondaryIndex<Deployment> indexMock = mock(PrimaryToSecondaryIndex.class);
+    Field field = InformerEventSource.class.getDeclaredField("primaryToSecondaryIndex");
+    field.setAccessible(true);
+    field.set(informerEventSource, indexMock);
+    return indexMock;
+  }
+
   private void assertNoEventProduced() {
     await()
         .pollDelay(Duration.ofMillis(70))
         .timeout(Duration.ofMillis(150))
         .untilAsserted(() -> verify(informerEventSource, never()).propagateEvent(any()));
   }
 
+  private void expectPropagateEvent(Deployment newResourceVersion) {
+    await()
+        .atMost(Duration.ofSeconds(1))
+        .untilAsserted(
+            () -> verify(informerEventSource, times(1)).propagateEvent(newResourceVersion));
+  }
+
   private void expectHandleUpdateEvent(int newResourceVersion, int oldResourceVersion) {
     await()
         .atMost(Duration.ofSeconds(1))

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/onrelistfilter/OnRelistFilterIT.java

@@ -17,6 +17,7 @@
 
 import java.time.Duration;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -36,6 +37,7 @@
  *   <li>re-list starts WHILE the update window is open — own write is propagated
  * </ul>
  */
+@Disabled("enable when fabric8 supports relist")
 class OnRelistFilterIT {
 
   static final String RESOURCE_NAME = "test-resource";