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

@@ -32,6 +32,7 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
 import io.javaoperatorsdk.operator.OperatorException;
+import io.javaoperatorsdk.operator.ReconcilerUtilsInternal;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.config.Informable;
 import io.javaoperatorsdk.operator.api.config.NamespaceChangeable;
@@ -186,14 +187,21 @@ public void handleRecentResourceCreate(ResourceID resourceID, R resource) {
 
   @Override
   public Optional<R> get(ResourceID resourceID) {
-    if (comparableResourceVersions) {
-      Optional<R> resource = temporaryResourceCache.getResourceFromCache(resourceID);
-      if (resource.isPresent()) {
-        log.debug("Latest resource found in temporary cache for Resource ID: {}", resourceID);
-        return resource;
-      }
-    }
+    // The order of these two lookups matters. If we queried the informer cache first,
+    // a race condition could occur: we might not find the resource there yet, then
+    // process an informer event that evicts the temporary resource cache entry. At that
+    // point the resource would already be present in the informer cache, but we would
+    // have missed it in both caches during this call.
+    Optional<R> resource = temporaryResourceCache.getResourceFromCache(resourceID);
     var res = cache.get(resourceID);
+    if (comparableResourceVersions
+        && resource.isPresent()
+        && res.filter(
+                r -> ReconcilerUtilsInternal.compareResourceVersions(r, resource.orElseThrow()) > 0)
+            .isEmpty()) {
+      log.debug("Latest resource found in temporary cache for Resource ID: {}", resourceID);
+      return resource;
+    }
     log.debug(
         "Resource not found, or older, in temporary cache. Found in informer cache {}, for"
             + " Resource ID: {}",