Ensure accurate resource conflict reporting in NoResourceConflict condition#2442
Open
pruthvitd wants to merge 1 commit intoRamenDR:mainfrom
Open
Ensure accurate resource conflict reporting in NoResourceConflict condition#2442pruthvitd wants to merge 1 commit intoRamenDR:mainfrom
pruthvitd wants to merge 1 commit intoRamenDR:mainfrom
Conversation
Correct IsDRActionInProgress() to avoid false “DR action in progress” when VRG spec/status are already in sync. This PR fixes an issue where IsDRActionInProgress() incorrectly reported that a DR action was in progress even when the Spec.ReplicationState and Status.State of the VRG were already aligned (and the action had effectively completed). The bug primarily surfaced on the secondary VRG, leading to misleading conflict checks and noisy/no-op DR flows. Signed-off-by: pruthvitd <prd@redhat.com>
pruthvitd
force-pushed
the
fix-vm-conflict
branch
from
4e9026b to
257b150
Compare
raaizik
reviewed
Mar 5, 2026
Comment on lines
+2470
to
+2479
| if isRepStateSecondary { | ||
| if !switchedToSecondary || (v.instance.Generation != status.ObservedGeneration) { | ||
| return true | ||
| } | ||
| } | ||
|
|
||
| if isRepStatePrimary { | ||
| if !switchedToPrimary || (v.instance.Generation != status.ObservedGeneration) { | ||
| return true | ||
| } |
Member
There was a problem hiding this comment.
IMO this removes duplication and is slightly clearer:
Suggested change
| if isRepStateSecondary { | |
| if !switchedToSecondary || (v.instance.Generation != status.ObservedGeneration) { | |
| return true | |
| } | |
| } | |
| if isRepStatePrimary { | |
| if !switchedToPrimary || (v.instance.Generation != status.ObservedGeneration) { | |
| return true | |
| } | |
| stateTransitionComplete := (isRepStateSecondary && switchedToSecondary) || (isRepStatePrimary && switchedToPrimary) | |
| if !stateTransitionComplete { | |
| return true | |
| } | |
| if v.instance.Generation != status.ObservedGeneration { | |
| return true | |
| } |
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
2 participants
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.
Correct IsDRActionInProgress() to avoid false “DR action in progress” when VRG spec/status are already in sync
This PR fixes an issue where IsDRActionInProgress() incorrectly reported that a DR action was in progress even when the Spec.ReplicationState and Status.State of the VRG were already aligned (and the action had effectively completed). The bug primarily surfaced on the secondary VRG, leading to misleading conflict checks and noisy/no-op DR flows.