Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2022
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2281377
fix: issue with post condition in workflow execution delete
csviri Sep 9, 2022
3eece23
fix: format
csviri Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .../io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowReconcileExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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)
Expand All @@ -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));
}


Expand Down Expand Up @@ -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);
Expand Down