cleanup

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/EventFilterSupport.java

@@ -73,7 +73,7 @@ synchronized Map<ResourceID, EventFilterWindow> getEventFilterWindows() {
     return eventFilterWindows;
   }
 
-  public synchronized void setStartingReList(String lastKnownVersion) {
+  public synchronized void setStartingReList() {
     ongoingReList = true;
     eventFilterWindows.values().forEach(EventFilterWindow::setReListStarted);
   }

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

@@ -70,7 +70,7 @@ && getFirstRelatedEvent().getAction().equals(ResourceAction.DELETED)) {
       return eventForRangeAndClear(relatedEvents, ownResourceVersions);
     }
 
-    var lastEventVersion = getLastRelatedEvent().getResourceVersion();
+    var lastEventVersion = relatedEvents.lastKey();
     var numberOwnUpdatesSelected = 0;
     long lastOwnVersion = -1;
     for (long ownVersion : ownResourceVersions) {
@@ -174,7 +174,7 @@ public synchronized boolean canBeRemoved() {
     return false;
   }
 
-  void addToOwnResourceVersions(String resourceVersion) {
+  public synchronized void addToOwnResourceVersions(String resourceVersion) {
     ownResourceVersions.add(Long.parseLong(resourceVersion));
   }
 

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

@@ -254,7 +254,7 @@ synchronized EventFilterSupport getEventFilterSupport() {
   }
 
   public synchronized void setOngoingRelist(String lastKnownSyncVersion) {
-    eventFilteringSupport.setStartingReList(lastKnownSyncVersion);
+    eventFilteringSupport.setStartingReList();
   }
 
   public synchronized void setRelistFinished(String syncResourceVersions) {

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

@@ -539,6 +539,34 @@ void reListBetweenTwoUpdates() {
     assertThat(eventFilterWindow.canBeRemoved()).isTrue();
   }
 
+  @Test
+  void combinedCaseWithEarlyEvent() {
+    // Scenario: an own write is in flight (RV recorded), a foreign event with a
+    // lower RV arrives, then the write completes (active → 0) but no echo for
+    // our own RV ever arrives. The held foreign event must surface — otherwise
+    // the window wedges (canRemoved stays false because relatedEvents is not
+    // empty) and the reconciler never learns about the foreign change.
+    eventFilterWindow.increaseActiveUpdates();
+    eventFilterWindow.addToOwnResourceVersions(s(FIRST_OWN_VERSION));
+    eventFilterWindow.addRelatedEvent(updateEvent(FIRST_OWN_VERSION - 2));
+
+    // Held while the write is in flight.
+    assertThat(eventFilterWindow.check()).isEmpty();
+
+    // Write completes, no echo for own=[FIRST_OWN_VERSION] ever arrived.
+    eventFilterWindow.decreaseActiveUpdates();
+
+    eventFilterWindow.setReListStarted();
+    eventFilterWindow.addRelatedEvent(updateEvent(FIRST_OWN_VERSION));
+    // The foreign event must surface now.
+    eventFilterWindow.setReListFinished();
+    assertThat(eventFilterWindow.check())
+        .hasValueSatisfying(e -> assertUpdateEvent(e, FIRST_OWN_VERSION, FIRST_OWN_VERSION - 3));
+
+    assertEmptyState();
+    assertThat(eventFilterWindow.canBeRemoved()).isTrue();
+  }
+
   void assertUpdateEvent(GenericResourceEvent event, Long resourceVersion) {
     assertUpdateEvent(event, resourceVersion, resourceVersion - 1);
   }