Fix PVC cleanup after relocate/failover with CephFS storage (volsync) #134
Conversation
This file contains 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
When we create a protected PVC we need to keep the OCM annotations (and maybe others) so they exist in the replicationdestination spec. When restoring a PVC during relocate, we need to include the stored annotations in the new PVC. This is required to keep the PVC owned by OCM. The first step is adding annotation to the type. The change includes also the generated files affected by this change. Signed-off-by: Nir Soffer <[email protected]> (cherry picked from commit 1d60ac9)
The golangci-lint does not allow adding more code in ensurePVCFromSnapshot() due to complexity. Lets move out the boring details of updating PVC labels to a new helper that will be used also for updating annotations. When pvc.Label is nil, do *not* share the map between the PVC and the ProtectedPVC. This is very fragile and inconsistent. Now we either update the existing map or allocating a new map owned by the PVC. Signed-off-by: Nir Soffer <[email protected]> (cherry picked from commit f887141)
Same as labels, copy the annotations from the rddepc protected PVC to the new PVC. Tested by new block in the existing test. Signed-off-by: Nir Soffer <[email protected]> (cherry picked from commit 6463a32)
To ensure that OCM owns the volsync protected PVC when the application is deleted or DR is disabled, copy the OCM annotations from the PVC to the protectedPVC. The annotations are propagated to the target clusters and used to create the PVC during failover and relocate. Tested by adding a new section in existing test. The test ensures that we copy only the OCM annotations and drop other annotations. Fixes: RamenDR#1033 Signed-off-by: Nir Soffer <[email protected]> (cherry picked from commit f19c8ed)
This annotation is added to the application PVC on the source relocate. At the time the annotation is added the protectedPVCs were already propagated to the target clusters, so it is never propagated to the target clusters. However if the annotation will be propagated to the target clusters it can break things, so now we filter it out when copying the PVC annotation to the protected PVC. Signed-off-by: Nir Soffer <[email protected]> (cherry picked from commit 825a0de)
|
@raghavendra-talur: No Bugzilla bug is referenced in the title of this pull request. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: raghavendra-talur The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
raghavendra-talur
merged commit c15961d
into
red-hat-storage:release-4.14
12 checks passed
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.
When using volsync ramen creates the PVCs on the destination cluster, so they are not owned
by OCM and OCM does not delete the PVCs when the application is deleted. Fix the issue by
copying the OCM annotations from the original PVC to the target PVC using the protected
PVCs mechanism.
This change has no effect with application sets since we don't have OCM annotations in this case. The issue also does not exist in this case.
Work in progress:
Tested on ocp 4.13 + odf 4.13 + ramen 4.13 + this pr (including crds)
subscription: relocate and failover work pvc is deleted after disabling dr
application sets: tested relocate, failover, and disable dr for regression
test with ocp 4.14 + odf 4.14 + ramen 4.14?