refactor: remove the use of knownResourceVersions (#2985)

closes: #2984

Signed-off-by: Steve Hawkins <[email protected]>

Author: shawkins

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

@@ -207,9 +207,6 @@ private synchronized void onAddOrUpdate(
   }
 
   private boolean canSkipEvent(R newObject, R oldObject, ResourceID resourceID) {
-    if (temporaryResourceCache.isKnownResourceVersion(newObject)) {
-      return true;
-    }
     var res = temporaryResourceCache.getResourceFromCache(resourceID);
     if (res.isEmpty()) {
       return isEventKnownFromAnnotation(newObject, oldObject);
@@ -223,7 +220,8 @@ private boolean canSkipEvent(R newObject, R oldObject, ResourceID resourceID) {
         "Resource found in temporal cache for id: {} resource versions equal: {}",
         resourceID,
         resVersionsEqual);
-    return resVersionsEqual;
+    return resVersionsEqual
+        || temporaryResourceCache.isLaterResourceVersion(resourceID, res.get(), newObject);
   }
 
   private boolean isEventKnownFromAnnotation(R newObject, R oldObject) {

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

@@ -95,19 +95,12 @@ void clean() {
   private final ExpirationCache<String> tombstones = new ExpirationCache<>(1000000, 1200000);
   private final ManagedInformerEventSource<T, ?, ?> managedInformerEventSource;
   private final boolean parseResourceVersions;
-  private final ExpirationCache<String> knownResourceVersions;
 
   public TemporaryResourceCache(
       ManagedInformerEventSource<T, ?, ?> managedInformerEventSource,
       boolean parseResourceVersions) {
     this.managedInformerEventSource = managedInformerEventSource;
     this.parseResourceVersions = parseResourceVersions;
-    if (parseResourceVersions) {
-      // keep up to the 50000 add/updates for up to 5 minutes
-      knownResourceVersions = new ExpirationCache<>(50000, 600000);
-    } else {
-      knownResourceVersions = null;
-    }
   }
 
   public synchronized void onDeleteEvent(T resource, boolean unknownState) {
@@ -137,9 +130,6 @@ public synchronized void putAddedResource(T newResource) {
    * @param previousResourceVersion null indicates an add
    */
   public synchronized void putResource(T newResource, String previousResourceVersion) {
-    if (knownResourceVersions != null) {
-      knownResourceVersions.add(newResource.getMetadata().getResourceVersion());
-    }
     var resourceId = ResourceID.fromResource(newResource);
     var cachedResource = managedInformerEventSource.get(resourceId).orElse(null);
 
@@ -174,17 +164,12 @@ public synchronized void putResource(T newResource, String previousResourceVersi
     }
   }
 
-  public synchronized boolean isKnownResourceVersion(T resource) {
-    return knownResourceVersions != null
-        && knownResourceVersions.contains(resource.getMetadata().getResourceVersion());
-  }
-
   /**
    * @return true if {@link ConfigurationService#parseResourceVersionsForEventFilteringAndCaching()}
    *     is enabled and the resourceVersion of newResource is numerically greater than
    *     cachedResource, otherwise false
    */
-  private boolean isLaterResourceVersion(ResourceID resourceId, T newResource, T cachedResource) {
+  public boolean isLaterResourceVersion(ResourceID resourceId, T newResource, T cachedResource) {
     try {
       if (parseResourceVersions
           && Long.parseLong(newResource.getMetadata().getResourceVersion())

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

@@ -111,8 +111,6 @@ void removesResourceFromCache() {
   void resourceVersionParsing() {
     this.temporaryResourceCache = new TemporaryResourceCache<>(informerEventSource, true);
 
-    assertThat(temporaryResourceCache.isKnownResourceVersion(testResource())).isFalse();
-
     ConfigMap testResource = propagateTestResourceToCache();
 
     // an event with a newer version will not remove
@@ -123,7 +121,6 @@ void resourceVersionParsing() {
             .endMetadata()
             .build());
 
-    assertThat(temporaryResourceCache.isKnownResourceVersion(testResource)).isTrue();
     assertThat(temporaryResourceCache.getResourceFromCache(ResourceID.fromResource(testResource)))
         .isPresent();