- improve test

- improve event handling

Author: attila.meszaros

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java

@@ -79,9 +79,7 @@ private void updateCustomResource(CustomResource updatedResource) {
         log.debug("Updating resource: {} with version: {}", updatedResource.getMetadata().getName(),
                 updatedResource.getMetadata().getResourceVersion());
         log.trace("Resource before update: {}", updatedResource);
-        addFinalizerIfNotPresent(updatedResource);
         replace(updatedResource);
-        log.trace("Resource after update: {}", updatedResource);
     }
 
 

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java

@@ -88,16 +88,11 @@ void scheduleEventFromApi(CustomResourceEvent event) {
                 return;
             }
             if (generationAware && !eventStore.hasLargerGenerationThanLastStored(event)
-                    && eventStore.lastProcessingHadFinalizer(event)) {
+                    && eventStore.successfullyProcessedWithFinalizer(event)) {
                 log.debug("Skipping event, has not larger generation than last stored, actual generation: {}, last stored: {} ",
                         event.getResource().getMetadata().getGeneration(), eventStore.getLastStoredGeneration(event));
                 return;
             }
-            if (generationAware && !eventStore.lastProcessingHadFinalizer(event)
-                    && ControllerUtils.hasDefaultFinalizer(event.getResource(), finalizer)) {
-                eventStore.markProcessedWitFinalizer(event.resourceUid(), true);
-            }
-
             if (eventStore.containsEventUnderProcessing(event.resourceUid())) {
                 log.debug("Scheduling event for later processing since there is an event under processing for same kind." +
                         " New event: {}", event);
@@ -122,6 +117,7 @@ private void scheduleEventForExecution(CustomResourceEvent event) {
                 return;
             }
             eventStore.addEventUnderProcessingAndUpdateLastGeneration(event);
+            markStartedProcessingWithFinalizer(event);
             executor.schedule(new EventConsumer(event, eventDispatcher, this),
                     nextBackOff.get(), TimeUnit.MILLISECONDS);
             log.trace("Scheduled task for event: {}", event);
@@ -134,6 +130,7 @@ void eventProcessingFinishedSuccessfully(CustomResourceEvent event) {
         try {
             lock.lock();
             eventStore.removeEventUnderProcessing(event.resourceUid());
+            markSuccessfullyProcessedWithFinalizer(event);
             if (eventStore.containsNotScheduledEvent(event.resourceUid())) {
                 log.debug("Scheduling recent event for processing: {}", event);
                 scheduleNotYetScheduledEventForExecution(event.resourceUid());
@@ -164,6 +161,18 @@ void eventProcessingFailed(CustomResourceEvent event) {
         }
     }
 
+    private void markStartedProcessingWithFinalizer(CustomResourceEvent event) {
+        if (ControllerUtils.hasDefaultFinalizer(event.getResource(),finalizer) && !eventStore.successfullyProcessedWithFinalizer(event)) {
+            eventStore.markStartedProcessingWithFinalizerOnResource(event);
+        }
+    }
+
+    private void markSuccessfullyProcessedWithFinalizer (CustomResourceEvent event) {
+        if (eventStore.startedProcessingWithFinalizerOnResource(event)) {
+            eventStore.markSuccessfullyProcessedWitFinalizer(event.resourceUid());
+        }
+    }
+
     private CustomResourceEvent selectEventToRetry(CustomResourceEvent event) {
         CustomResourceEvent lastEvent = eventStore.getReceivedLastEventForGenerationAwareRetry(event.resourceUid());
         if (!event.getResource().getMetadata().getResourceVersion()

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventStore.java

@@ -9,7 +9,9 @@ public class EventStore {
     private final Map<String, CustomResourceEvent> eventsUnderProcessing = new HashMap<>();
     private final Map<String, Long> lastGeneration = new HashMap<>();
     private final Map<String, CustomResourceEvent> receivedLastEventForGenerationAwareRetry = new HashMap<>();
-    private final Map<String, Boolean> lastProcessingWithFinalizer = new HashMap<>();
+
+    private final Map<String, Boolean> startedProcessingWithFinalizer = new HashMap<>();
+    private final Map<String, Boolean> successFullyProcessedWithFinalizer = new HashMap<>();
 
     public boolean containsNotScheduledEvent(String uuid) {
         return eventsNotScheduled.containsKey(uuid);
@@ -62,18 +64,28 @@ public CustomResourceEvent getReceivedLastEventForGenerationAwareRetry(String uu
         return receivedLastEventForGenerationAwareRetry.get(uuid);
     }
 
-    public boolean lastProcessingHadFinalizer(CustomResourceEvent event) {
-        Boolean res = lastProcessingWithFinalizer.get(event.resourceUid());
+    public void markStartedProcessingWithFinalizerOnResource(CustomResourceEvent event) {
+        startedProcessingWithFinalizer.put(event.resourceUid(),true);
+    }
+
+    public boolean startedProcessingWithFinalizerOnResource(CustomResourceEvent event) {
+        Boolean res = startedProcessingWithFinalizer.get(event.resourceUid());
+        return res == null ? false : res;
+    }
+
+    public boolean successfullyProcessedWithFinalizer(CustomResourceEvent event) {
+        Boolean res = successFullyProcessedWithFinalizer.get(event.resourceUid());
         return res == null ? false : res;
     }
 
-    public void markProcessedWitFinalizer(String uuid, boolean hadFinalizer) {
-        lastProcessingWithFinalizer.put(uuid, hadFinalizer);
+    public void markSuccessfullyProcessedWitFinalizer(String uuid) {
+        successFullyProcessedWithFinalizer.put(uuid, true);
     }
 
     public void cleanup(String uuid) {
         lastGeneration.remove(uuid);
         receivedLastEventForGenerationAwareRetry.remove(uuid);
-        lastProcessingWithFinalizer.remove(uuid);
+        successFullyProcessedWithFinalizer.remove(uuid);
+        startedProcessingWithFinalizer.remove(uuid);
     }
 }

operator-framework/src/test/java/com/github/containersolutions/operator/ControllerExecutionIT.java

@@ -19,10 +19,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
 public class ControllerExecutionIT {
 
     private final static Logger log = LoggerFactory.getLogger(ControllerExecutionIT.class);
+    public static final String TEST_CUSTOM_RESOURCE_NAME = "test-custom-resource";
     private IntegrationTestSupport integrationTestSupport = new IntegrationTestSupport();
 
     public void initAndCleanup(boolean controllerStatusUpdate) {
@@ -73,7 +74,7 @@ public void generationAwareRetryConflict() {
             integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).createOrReplace(resource2);
 
             awaitResourcesCreatedOrUpdated();
-            awaitStatusUpdated(10);
+            awaitStatusUpdated(20);
         });
     }
 
@@ -95,7 +96,8 @@ void awaitStatusUpdated() {
     void awaitStatusUpdated(int timeout) {
         await("cr status updated").atMost(timeout, TimeUnit.SECONDS)
                 .untilAsserted(() -> {
-                    TestCustomResource cr = (TestCustomResource) integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).withName("test-custom-resource").get();
+                    TestCustomResource cr = (TestCustomResource) integrationTestSupport.getCrOperations()
+                            .inNamespace(TEST_NAMESPACE).withName(TEST_CUSTOM_RESOURCE_NAME).get();
                     assertThat(cr).isNotNull();
                     assertThat(cr.getStatus()).isNotNull();
                     assertThat(cr.getStatus().getConfigMapStatus()).isEqualTo("ConfigMap Ready");
@@ -105,7 +107,7 @@ void awaitStatusUpdated(int timeout) {
     private TestCustomResource testCustomResource() {
         TestCustomResource resource = new TestCustomResource();
         resource.setMetadata(new ObjectMetaBuilder()
-                .withName("test-custom-resource")
+                .withName(TEST_CUSTOM_RESOURCE_NAME)
                 .withNamespace(TEST_NAMESPACE)
                 .build());
         resource.getMetadata().setAnnotations(new HashMap<>());