improvements on edge cases

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

@@ -80,8 +80,11 @@ public synchronized Optional<GenericResourceEvent> doneEventFilterModify(Resourc
       return Optional.empty();
     }
     var ed = activeUpdates.get(resourceID);
-    if (!ed.decreaseActiveUpdates()) {
-      log.debug("Active updates {} for resource id: {}", ed.getActiveUpdates(), resourceID);
+    if (ed == null || !ed.decreaseActiveUpdates()) {
+      log.debug(
+          "Active updates {} for resource id: {}",
+          ed == null ? null : ed.getActiveUpdates(),
+          resourceID);
       return Optional.empty();
     }
 
@@ -232,7 +235,7 @@ private String getLastSyncResourceVersion(String namespace) {
    * explicitly add resources to this cache. Those are cleaned up by this check, which is triggered
    * by the informer's onList callback.
    */
-  public void checkGhostResources() {
+  public synchronized void checkGhostResources() {
     log.debug("Checking for ghost resources.");
     var iterator = cache.entrySet().iterator();
     while (iterator.hasNext()) {
@@ -247,19 +250,18 @@ public void checkGhostResources() {
             e.getKey(),
             ns);
         iterator.remove();
+        activeUpdates.remove(e.getKey());
         continue;
       }
       if ((ReconcilerUtilsInternal.compareResourceVersions(
                   e.getValue().getMetadata().getResourceVersion(), getLastSyncResourceVersion(ns))
               < 0)
           // making sure we have the situation where resource is missing from the cache
-          && managedInformerEventSource
-              .manager()
-              .get(ResourceID.fromResource(e.getValue()))
-              .isEmpty()) {
+          && managedInformerEventSource.manager().get(e.getKey()).isEmpty()) {
+        log.debug("Removing ghost resource with ID: {}", e.getKey());
         iterator.remove();
+        activeUpdates.remove(e.getKey());
         managedInformerEventSource.handleEvent(ResourceAction.DELETED, e.getValue(), null, true);
-        log.debug("Removing ghost resource with ID: {}", e.getKey());
       }
     }
   }