fix: issue with post condition in workflow execution delete (#1449)

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowReconcileExecutor.java

@@ -35,7 +35,8 @@ public class WorkflowReconcileExecutor<P extends HasMetadata> {
       new ConcurrentHashMap<>();
 
   private final Set<DependentResourceNode> markedForDelete = ConcurrentHashMap.newKeySet();
-  private final Set<DependentResourceNode> deleteConditionNotMet = ConcurrentHashMap.newKeySet();
+  private final Set<DependentResourceNode> deletePostConditionNotMet =
+      ConcurrentHashMap.newKeySet();
   // used to remember reconciled (not deleted or errored) dependents
   private final Set<DependentResourceNode> reconciled = ConcurrentHashMap.newKeySet();
   private final Map<DependentResource, ReconcileResult> reconcileResults =
@@ -99,7 +100,7 @@ private synchronized <R> void handleReconcile(DependentResourceNode<R, P> depend
     }
   }
 
-  private void handleDelete(DependentResourceNode dependentResourceNode) {
+  private synchronized void handleDelete(DependentResourceNode dependentResourceNode) {
     log.debug("Submitting for delete: {}", dependentResourceNode);
 
     if (alreadyVisited(dependentResourceNode)
@@ -119,7 +120,7 @@ private void handleDelete(DependentResourceNode dependentResourceNode) {
   private boolean allDependentsDeletedAlready(DependentResourceNode<?, P> dependentResourceNode) {
     var dependents = dependentResourceNode.getParents();
     return dependents.stream().allMatch(d -> alreadyVisited.contains(d) && !notReady.contains(d)
-        && !exceptionsDuringExecution.containsKey(d) && !deleteConditionNotMet.contains(d));
+        && !exceptionsDuringExecution.containsKey(d) && !deletePostConditionNotMet.contains(d));
   }
 
 
@@ -207,16 +208,17 @@ public void run() {
             && !(dependentResource instanceof GarbageCollected)) {
           ((Deleter<P>) dependentResourceNode.getDependentResource()).delete(primary, context);
         }
-        alreadyVisited.add(dependentResourceNode);
         boolean deletePostConditionMet =
             deletePostCondition.map(c -> c.isMet(primary,
                 dependentResourceNode.getDependentResource().getSecondaryResource(primary)
                     .orElse(null),
                 context)).orElse(true);
         if (deletePostConditionMet) {
+          alreadyVisited.add(dependentResourceNode);
           handleDependentDeleted(dependentResourceNode);
         } else {
-          deleteConditionNotMet.add(dependentResourceNode);
+          deletePostConditionNotMet.add(dependentResourceNode);
+          alreadyVisited.add(dependentResourceNode);
         }
       } catch (RuntimeException e) {
         handleExceptionInExecutor(dependentResourceNode, e);