fix: do not NPE when adding a finalizer to a resource deleted mid-retry - #3530
Draft
csviri wants to merge 1 commit into
Draft
fix: do not NPE when adding a finalizer to a resource deleted mid-retry#3530csviri wants to merge 1 commit into
csviri wants to merge 1 commit into
Conversation
`conflictRetryingPatchPrimary` / `conflictRetryingPatch` re-read the
resource from the API server after a 409 or 422 and then re-evaluate the
precondition:
resource = operation.inNamespace(ns).withName(name).get();
`get()` returns null if the resource was deleted in the meantime, so the
next iteration calls the precondition with null. `removeFinalizer`
anticipates this:
r -> {
if (r == null) {
log.warn("Cannot remove finalizer since resource not exists.");
return false;
}
return r.hasFinalizer(finalizerName);
}
but `addFinalizer` passes `r -> !r.hasFinalizer(finalizerName)`, which
throws a NullPointerException instead of exiting cleanly.
Gives `addFinalizer` the same null guard, in both `ResourceOperations` and
the deprecated `PrimaryUpdateAndCacheUtils`.
No test is added: reaching the retry path requires stubbing the client to
answer 409/422 and then 404 through the whole fabric8 DSL chain, which the
existing unit tests are not set up for.
16 tasks
Contributor
There was a problem hiding this comment.
Pull request overview
Prevents a NullPointerException when addFinalizer is executed through the conflict-retry patch path and the primary resource is deleted between retries (i.e., the re-read get() returns null). This makes addFinalizer behave consistently with existing removeFinalizer handling in ResourceOperations.
Changes:
- Add a null-guard to the
addFinalizerprecondition inResourceOperationsto avoid dereferencing a deleted resource during retry. - Add the same null-guard to the deprecated
PrimaryUpdateAndCacheUtils.addFinalizerretry precondition (and log when the resource is gone).
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ResourceOperations.java | Adds null-guarded precondition for addFinalizer during conflict-retry patch. |
| operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/PrimaryUpdateAndCacheUtils.java | Adds null-guarded precondition for deprecated addFinalizer during conflict-retry patch. |
| r -> !r.hasFinalizer(finalizerName)); | ||
| r -> { | ||
| if (r == null) { | ||
| log.warn("Cannot add finalizer since resource not exists."); |
Comment on lines
+1082
to
+1086
| r -> { | ||
| if (r == null) { | ||
| log.warn("Cannot add finalizer since resource no longer exists."); | ||
| return false; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
conflictRetryingPatchPrimary/conflictRetryingPatchre-read theresource from the API server after a 409 or 422 and then re-evaluate the
precondition:
get()returns null if the resource was deleted in the meantime, so thenext iteration calls the precondition with null.
removeFinalizeranticipates this:
but
addFinalizerpassesr -> !r.hasFinalizer(finalizerName), whichthrows a NullPointerException instead of exiting cleanly.
Gives
addFinalizerthe same null guard, in bothResourceOperationsandthe deprecated
PrimaryUpdateAndCacheUtils.No test is added: reaching the retry path requires stubbing the client to
answer 409/422 and then 404 through the whole fabric8 DSL chain, which the
existing unit tests are not set up for.
Part of #3517