Skip to content
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

Jump to bottom

Fix PVC deletion with CephFS (volsync) #132

Closed
wants to merge 5 commits into from
Closed

Fix PVC deletion with CephFS (volsync) #132

wants to merge 5 commits into from

Commits on Aug 30, 2023

  1. Add annotations to ProtectedPVC 

    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)
    @nirs
    nirs committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    0f80e76 View commit details
    Browse the repository at this point in the history

  2. Extract helper for updating string maps 

    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)
    @nirs
    nirs committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    b3902f1 View commit details
    Browse the repository at this point in the history

  3. Include annotations from rdspec in restored PVC 

    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)
    @nirs
    nirs committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    96a5f7c View commit details
    Browse the repository at this point in the history

  4. Propagate OCM annotations from primary PVC 

    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)
    @nirs
    nirs committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    7ab5dd3 View commit details
    Browse the repository at this point in the history

  5. Filter out the do-no-delete annotation 

    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)
    @nirs
    nirs committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    b7275cd View commit details
    Browse the repository at this point in the history