Skip to content

fix: do not NPE when adding a finalizer to a resource deleted mid-retry #3530

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

Draft
csviri wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: do not NPE when adding a finalizer to a resource deleted mid-retry #3530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion .../src/main/java/io/javaoperatorsdk/operator/api/reconciler/PrimaryUpdateAndCacheUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,13 @@ public static <P extends HasMetadata> P addFinalizer(
r.addFinalizer(finalizerName);
return r;
},
r -> !r.hasFinalizer(finalizerName));
r -> {
if (r == null) {
log.warn("Cannot add finalizer since resource not exists.");
return false;
}
return !r.hasFinalizer(finalizerName);
});
}

/**
Expand Down
8 changes: 7 additions & 1 deletion ...ork-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ResourceOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,13 @@ public P addFinalizer(String finalizerName, boolean cacheOnly) {
r.addFinalizer(finalizerName);
return r;
},
r -> !r.hasFinalizer(finalizerName),
r -> {
if (r == null) {
log.warn("Cannot add finalizer since resource no longer exists.");
return false;
}
Comment on lines +1082 to +1086
return !r.hasFinalizer(finalizerName);
},
cacheOnly);
}

Expand Down
Loading