small fix, test repeats

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

@@ -100,18 +100,20 @@ public R eventFilteringUpdateAndCacheResource(R resourceToUpdate, UnaryOperator<
     try {
       temporaryResourceCache.startEventFilteringModify(id);
       updatedResource = updateMethod.apply(resourceToUpdate);
-      log.debug("Resource update successful");
       handleRecentResourceUpdate(id, updatedResource, resourceToUpdate);
+      log.debug("Caching resource update successful");
       return updatedResource;
     } finally {
       var res = temporaryResourceCache.doneEventFilterModify(id);
       res.ifPresentOrElse(
-          r ->
-              handleEvent(
-                  r.getAction(),
-                  (R) r.getResource().orElseThrow(),
-                  (R) r.getPreviousResource().orElse(null),
-                  r.getLastStateUnknow()),
+          r -> {
+            log.debug("Propagating not own event");
+            handleEvent(
+                r.getAction(),
+                (R) r.getResource().orElseThrow(),
+                (R) r.getPreviousResource().orElse(null),
+                r.getLastStateUnknow());
+          },
           () -> log.debug("No new event present after the filtering update"));
     }
   }

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

@@ -143,6 +143,7 @@ private synchronized EventHandling onEvent(
           new GenericResourceEvent(action, resource, prevResourceVersion, unknownState));
       return EventHandling.IGNORE;
     } else {
+      log.debug("No active recornding, event handling: {}", result);
       return result;
     }
   }
@@ -194,6 +195,9 @@ public synchronized void putResource(T newResource) {
 
     // also make sure that we're later than the existing temporary entry
     var cachedResource = getResourceFromCache(resourceId).orElse(null);
+    Optional.ofNullable(activeUpdates.get(resourceId))
+        .ifPresent(
+            au -> au.addToOwnResourceVersions(newResource.getMetadata().getResourceVersion()));
 
     if (cachedResource == null
         || ReconcilerUtilsInternal.compareResourceVersions(newResource, cachedResource) > 0) {
@@ -202,10 +206,6 @@ public synchronized void putResource(T newResource) {
           newResource.getMetadata().getResourceVersion(),
           resourceId);
       cache.put(resourceId, newResource);
-      var au = activeUpdates.get(resourceId);
-      if (au != null) {
-        au.addToOwnResourceVersions(newResource.getMetadata().getResourceVersion());
-      }
     }
   }
 

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

@@ -25,6 +25,7 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.ObjectMeta;
@@ -72,6 +73,7 @@ class InformerEventSourceTest {
 
   private static final String PREV_RESOURCE_VERSION = "0";
   private static final String DEFAULT_RESOURCE_VERSION = "2";
+  public static final int REPEAT_COUNT = 10;
 
   private InformerEventSource<Deployment, TestCustomResource> informerEventSource;
   private final KubernetesClient clientMock = MockKubernetesClient.client(Deployment.class);
@@ -214,7 +216,7 @@ void filtersOnDeleteEvents() {
     verify(eventHandlerMock, never()).handleEvent(any());
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void handlesPrevResourceVersionForUpdate() {
     withRealTemporaryResourceCache();
 
@@ -226,7 +228,7 @@ void handlesPrevResourceVersionForUpdate() {
     expectHandleAddEvent(2, 1);
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void handlesPrevResourceVersionForUpdateInCaseOfException() {
     withRealTemporaryResourceCache();
 
@@ -244,7 +246,7 @@ void handlesPrevResourceVersionForUpdateInCaseOfException() {
     expectHandleAddEvent(2, 1);
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void handlesPrevResourceVersionForUpdateInCaseOfMultipleUpdates() {
     withRealTemporaryResourceCache();
 
@@ -259,7 +261,7 @@ void handlesPrevResourceVersionForUpdateInCaseOfMultipleUpdates() {
     expectHandleAddEvent(4, 2);
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void doesNotPropagateEventIfReceivedBeforeUpdate() {
     withRealTemporaryResourceCache();
 
@@ -271,7 +273,7 @@ void doesNotPropagateEventIfReceivedBeforeUpdate() {
     assertNoEventProduced();
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void filterAddEventBeforeUpdate() {
     withRealTemporaryResourceCache();
 
@@ -282,7 +284,7 @@ void filterAddEventBeforeUpdate() {
     expectHandleAddEvent(2);
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void multipleCachingFilteringUpdates() {
     withRealTemporaryResourceCache();
     CountDownLatch latch = sendForEventFilteringUpdate(3);
@@ -299,7 +301,7 @@ void multipleCachingFilteringUpdates() {
     assertNoEventProduced();
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void multipleCachingFilteringUpdates_variant2() {
     withRealTemporaryResourceCache();
 
@@ -317,7 +319,7 @@ void multipleCachingFilteringUpdates_variant2() {
     assertNoEventProduced();
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void multipleCachingFilteringUpdates_variant3() {
     withRealTemporaryResourceCache();
 
@@ -335,7 +337,7 @@ void multipleCachingFilteringUpdates_variant3() {
     assertNoEventProduced();
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void multipleCachingFilteringUpdates_variant4() {
     withRealTemporaryResourceCache();
 
@@ -353,7 +355,7 @@ void multipleCachingFilteringUpdates_variant4() {
     assertNoEventProduced();
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void ghostCheckRemovesCachedResourceDuringFilteringUpdate() {
     var mes = mock(ManagedInformerEventSource.class);
     var mim = mock(InformerManager.class);
@@ -383,7 +385,7 @@ void ghostCheckRemovesCachedResourceDuringFilteringUpdate() {
     assertThat(temporaryResourceCache.getResourceFromCache(resourceId)).isEmpty();
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void ghostCheckRunsConcurrentlyWithPutResource() {
     var mes = mock(ManagedInformerEventSource.class);
     var mim = mock(InformerManager.class);
@@ -414,7 +416,7 @@ void ghostCheckRunsConcurrentlyWithPutResource() {
         .isPresent();
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void filteringUpdateAndGhostCheckWithNamespaceChange() {
     var mes = mock(ManagedInformerEventSource.class);
     var mim = mock(InformerManager.class);
@@ -448,7 +450,7 @@ void filteringUpdateAndGhostCheckWithNamespaceChange() {
     assertThat(temporaryResourceCache.getResourceFromCache(resourceId)).isEmpty();
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void propagatesIntermediateEventForExternalUpdateDuringFiltering() {
     // Causal-dependency fix: another controller updated the resource between our read
     // and our write. The informer delivers that update during our active filter; since
@@ -474,7 +476,7 @@ void propagatesIntermediateEventForExternalUpdateDuringFiltering() {
     expectHandleAddEvent(3, 2);
   }
 
-  @Test
+  @RepeatedTest(REPEAT_COUNT)
   void doesNotPropagateIntermediateEventForOurOwnIntermediateUpdate() {
     // Two consecutive own writes (rv 3 then rv 4) within an open filter window: an
     // event for the older own version must be deferred since it's recognized as our own.