mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-04-11 18:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: no need to create a snapshot on a thick-provisioned volume

Browse Source 
When cloning a volume from a (CSI) snapshot, we use DeepCopy() and do
not need an RBD snapshot as source.

Suggested-by: Madhu Rajanna <madhupr007@gmail.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-06-21 11:05:24 +02:00 committed by mergify[bot]
parent d2c4cacb39
commit eeec4471c5
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/rbd/controllerserver.go
View File

@ -1047,7 +1047,6 @@ func (cs *ControllerServer) doSnapshotClone(ctx context.Context, parentVol *rbdV
// parent volume of the clone to check thick provision during CreateVolume // parent volume of the clone to check thick provision during CreateVolume
// from snapshot operation because the parent volume can be deleted anytime // from snapshot operation because the parent volume can be deleted anytime
// after snapshot is created. // after snapshot is created.
// TODO: copy thick provision config
thick, err := parentVol.isThickProvisioned() thick, err := parentVol.isThickProvisioned()
if err != nil { if err != nil {
return ready, nil, status.Errorf(codes.Internal, "failed checking thick-provisioning of %q: %s", parentVol, err) return ready, nil, status.Errorf(codes.Internal, "failed checking thick-provisioning of %q: %s", parentVol, err)
@ -1058,14 +1057,14 @@ func (cs *ControllerServer) doSnapshotClone(ctx context.Context, parentVol *rbdV
if err != nil { if err != nil {
return ready, nil, status.Errorf(codes.Internal, "failed mark %q thick-provisioned: %s", cloneRbd, err) return ready, nil, status.Errorf(codes.Internal, "failed mark %q thick-provisioned: %s", cloneRbd, err)
} }
} } else {
err = cloneRbd.createSnapshot(ctx, rbdSnap)
err = cloneRbd.createSnapshot(ctx, rbdSnap) if err != nil {
if err != nil { // update rbd image name for logging
// update rbd image name for logging rbdSnap.RbdImageName = cloneRbd.RbdImageName
rbdSnap.RbdImageName = cloneRbd.RbdImageName util.ErrorLog(ctx, "failed to create snapshot %s: %v", rbdSnap, err)
util.ErrorLog(ctx, "failed to create snapshot %s: %v", rbdSnap, err) return ready, cloneRbd, err
return ready, cloneRbd, err }
} }
err = cloneRbd.getImageID() err = cloneRbd.getImageID()