mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-30 10:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: copyEncryptionConfig for thickProvisioned snap restore too

Browse Source 
This commit adds bugfix to copy encryption passphrase for thick
provisioned PVC restored from snapshot.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit ded75eb099)
This commit is contained in:
Rakshith R 2021-10-01 11:16:20 +05:30 committed by mergify[bot]
parent 15c2df0c39
commit 711fbbfdcc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/rbd/controllerserver.go
View File

@ -602,6 +602,10 @@ func (cs *ControllerServer) createVolumeFromSnapshot(
if err != nil { if err != nil {
return status.Errorf(codes.Internal, "failed to mark %q thick-provisioned: %s", rbdVol, err) return status.Errorf(codes.Internal, "failed to mark %q thick-provisioned: %s", rbdVol, err)
} }
err = parentVol.copyEncryptionConfig(&rbdVol.rbdImage, true)
if err != nil {
return status.Errorf(codes.Internal, err.Error())
}
} else { } else {
// create clone image and delete snapshot // create clone image and delete snapshot
err = rbdVol.cloneRbdImageFromSnapshot(ctx, rbdSnap, parentVol) err = rbdVol.cloneRbdImageFromSnapshot(ctx, rbdSnap, parentVol)