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

rbd: use DeepCopy() when restoring a thick-snapshot

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-06-17 15:35:15 +02:00 committed by mergify[bot]
parent 8639015a9f
commit 7f1bdb49d1
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
internal/rbd/controllerserver.go
View File

@ -379,22 +379,22 @@ func (cs *ControllerServer) repairExistingVolume(ctx context.Context, req *csi.C
// When cloning into a thick-provisioned volume was happening, // When cloning into a thick-provisioned volume was happening,
// the image should be marked as thick-provisioned, unless it // the image should be marked as thick-provisioned, unless it
// was aborted in flight. In order to restart the // was aborted in flight. In order to restart the
// thick-cloning, delete the volume and let the caller retry // thick-cloning, delete the volume and undo the reservation in
// from the start. // the journal to let the caller retry from the start.
if isThickProvisionRequest(req.GetParameters()) { if isThickProvisionRequest(req.GetParameters()) {
thick, err := rbdVol.isThickProvisioned() thick, err := rbdVol.isThickProvisioned()
if err != nil { if err != nil {
return nil, status.Errorf(codes.Aborted, "failed to verify thick-provisioned volume %q: %s", rbdVol, err) return nil, status.Errorf(codes.Internal, "failed to verify thick-provisioned volume %q: %s", rbdVol, err)
} else if !thick { } else if !thick {
err = cleanUpSnapshot(ctx, parentVol, rbdSnap, rbdVol, cr) err = cleanUpSnapshot(ctx, parentVol, rbdSnap, rbdVol, cr)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Aborted, "failed to remove partially cloned volume %q: %s", rbdVol, err) return nil, status.Errorf(codes.Internal, "failed to remove partially cloned volume %q: %s", rbdVol, err)
} }
err = undoVolReservation(ctx, rbdVol, cr) err = undoVolReservation(ctx, rbdVol, cr)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Aborted, "failed to remove volume %q from journal: %s", rbdVol, err) return nil, status.Errorf(codes.Internal, "failed to remove volume %q from journal: %s", rbdVol, err)
} }
return nil, status.Errorf(codes.Aborted, "cloning thick-provisioned volume %q has been interrupted, please retry", rbdVol) return nil, status.Errorf(codes.Internal, "cloning thick-provisioned volume %q has been interrupted, please retry", rbdVol)
} }
} }
} }
@ -503,11 +503,22 @@ func (cs *ControllerServer) createVolumeFromSnapshot(ctx context.Context, cr *ut
// as we are operating on single cluster reuse the connection // as we are operating on single cluster reuse the connection
parentVol.conn = rbdVol.conn.Copy() parentVol.conn = rbdVol.conn.Copy()
// create clone image and delete snapshot if rbdVol.ThickProvision {
err = rbdVol.cloneRbdImageFromSnapshot(ctx, rbdSnap, parentVol) err = parentVol.DeepCopy(rbdVol)
if err != nil { if err != nil {
util.ErrorLog(ctx, "failed to clone rbd image %s from snapshot %s: %v", rbdVol, rbdSnap, err) return status.Errorf(codes.Internal, "failed to deep copy %q into %q: %v", parentVol, rbdVol, err)
return err }
err = rbdVol.setThickProvisioned()
if err != nil {
return status.Errorf(codes.Internal, "failed to mark %q thick-provisioned: %s", rbdVol, err)
}
} else {
// create clone image and delete snapshot
err = rbdVol.cloneRbdImageFromSnapshot(ctx, rbdSnap, parentVol)
if err != nil {
util.ErrorLog(ctx, "failed to clone rbd image %s from snapshot %s: %v", rbdVol, rbdSnap, err)
return err
}
} }
util.DebugLog(ctx, "create volume %s from snapshot %s", rbdVol.RequestName, rbdSnap.RbdSnapName) util.DebugLog(ctx, "create volume %s from snapshot %s", rbdVol.RequestName, rbdSnap.RbdSnapName)