wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

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

@@ -83,25 +83,34 @@ public void changeNamespaces(Set<String> namespaces) {
     }
   }
 
+  /**
+   * Updates the resource and makes sure that the response is available for the next reconciliation.
+   * It does not filter the event produced by this update.
+   */
   public R updateAndCacheResource(R resourceToUpdate, UnaryOperator<R> updateMethod) {
     ResourceID id = ResourceID.fromResource(resourceToUpdate);
     var updated = updateMethod.apply(resourceToUpdate);
     handleRecentResourceUpdate(id, updated, resourceToUpdate);
     return updated;
   }
 
+  /**
+   * Updates the resource and makes sure that the response is available for the next reconciliation.
+   * Also makes sure that the even produced by this update is filtered, thus does not trigger the
+   * reconciliation.
+   */
   public R eventFilteringUpdateAndCacheResource(R resourceToUpdate, UnaryOperator<R> updateMethod) {
     ResourceID id = ResourceID.fromResource(resourceToUpdate);
     if (log.isDebugEnabled()) {
       log.debug("Update and cache: {}", id);
     }
     try {
-      temporaryResourceCache.startEventFilterModifying(id);
+      temporaryResourceCache.startEventFilteringModify(id);
       var updated = updateMethod.apply(resourceToUpdate);
       handleRecentResourceUpdate(id, updated, resourceToUpdate);
       return updated;
     } finally {
-      temporaryResourceCache.doneEventFilterModifying(id);
+      temporaryResourceCache.doneEventFilterModify(id);
     }
   }
 

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

@@ -63,7 +63,7 @@ public TemporaryResourceCache(boolean comparableResourceVersions) {
     this.comparableResourceVersions = comparableResourceVersions;
   }
 
-  public void startEventFilterModifying(ResourceID id) {
+  public void startEventFilteringModify(ResourceID id) {
     if (!comparableResourceVersions) {
       return;
     }
@@ -80,7 +80,7 @@ public void startEventFilterModifying(ResourceID id) {
         .lock();
   }
 
-  public void doneEventFilterModifying(ResourceID id) {
+  public void doneEventFilterModify(ResourceID id) {
     if (!comparableResourceVersions) {
       return;
     }
@@ -97,7 +97,7 @@ public void onDeleteEvent(T resource, boolean unknownState) {
   }
 
   /**
-   * @return true if the resourceVersion was already known
+   * @return true if the resourceVersion was already known and not skipped for event filtering
    */
   public boolean onAddOrUpdateEvent(T resource) {
     return onEvent(resource, false);
@@ -131,8 +131,10 @@ private boolean onEvent(T resource, boolean unknownState) {
               }
               if (comp < 0) {
                 filter[0] = true;
+              } else if (comp == 0) {
+                filter[0] = !skipFiltering.remove(resourceId);
               } else {
-                filter[0] = skipFiltering.remove(resourceId);
+                skipFiltering.remove(resourceId);
               }
             }
             if (remove) {

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

@@ -122,15 +122,15 @@ void nonComparableResourceVersionsDisables() {
   void lockedEventBeforePut() throws Exception {
     var testResource = testResource();
 
-    temporaryResourceCache.startEventFilterModifying(ResourceID.fromResource(testResource));
+    temporaryResourceCache.startEventFilteringModify(ResourceID.fromResource(testResource));
 
     ExecutorService ex = Executors.newSingleThreadExecutor();
     try {
       var result = ex.submit(() -> temporaryResourceCache.onAddOrUpdateEvent(testResource));
 
       temporaryResourceCache.putResource(testResource);
       assertThat(result.isDone()).isFalse();
-      temporaryResourceCache.doneEventFilterModifying(ResourceID.fromResource(testResource));
+      temporaryResourceCache.doneEventFilterModify(ResourceID.fromResource(testResource));
       assertThat(result.get(10, TimeUnit.SECONDS)).isTrue();
     } finally {
       ex.shutdownNow();
@@ -149,7 +149,28 @@ void putBeforeEvent() {
     nextResource.getMetadata().setResourceVersion("3");
     temporaryResourceCache.putResource(nextResource);
 
-    // now expect an event with the matching resourceVersion to be known after the put
+    // the result is false since the put was not part of event filtering update
+    result = temporaryResourceCache.onAddOrUpdateEvent(nextResource);
+    assertThat(result).isFalse();
+  }
+
+  @Test
+  void putBeforeEventWithEventFiltering() {
+    var testResource = testResource();
+
+    // first ensure an event is not known
+    var result = temporaryResourceCache.onAddOrUpdateEvent(testResource);
+    assertThat(result).isFalse();
+
+    var nextResource = testResource();
+    nextResource.getMetadata().setResourceVersion("3");
+    var resourceId = ResourceID.fromResource(testResource);
+
+    temporaryResourceCache.startEventFilteringModify(resourceId);
+    temporaryResourceCache.putResource(nextResource);
+    temporaryResourceCache.doneEventFilterModify(resourceId);
+
+    // the result is false since the put was not part of event filtering update
     result = temporaryResourceCache.onAddOrUpdateEvent(nextResource);
     assertThat(result).isTrue();
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ssaissue/specupdate/SSASpecUpdateReconciler.java

@@ -15,6 +15,9 @@
  */
 package io.javaoperatorsdk.operator.baseapi.ssaissue.specupdate;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
@@ -27,18 +30,21 @@
 public class SSASpecUpdateReconciler
     implements Reconciler<SSASpecUpdateCustomResource>, Cleaner<SSASpecUpdateCustomResource> {
 
+  private static final Logger log = LoggerFactory.getLogger(SSASpecUpdateReconciler.class);
+
   @Override
   public UpdateControl<SSASpecUpdateCustomResource> reconcile(
       SSASpecUpdateCustomResource resource, Context<SSASpecUpdateCustomResource> context) {
 
     var copy = createFreshCopy(resource);
     copy.getSpec().setValue("value");
-    context
-        .getClient()
-        .resource(copy)
-        .fieldManager(context.getControllerConfiguration().fieldManager())
-        .serverSideApply();
-
+    var res =
+        context
+            .getClient()
+            .resource(copy)
+            .fieldManager(context.getControllerConfiguration().fieldManager())
+            .serverSideApply();
+    log.info("res: {}", res);
     return UpdateControl.noUpdate();
   }