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

cephfs: remove subvolume during clone

Browse Source 
If any operations like Resize, Deleting
snapshot fails, we need to remove
both snapshot and the clone to avoid
resource leak.

closes: #4218

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2023-11-02 11:41:10 +01:00 committed by mergify[bot]
parent 2598300f66
commit c25f572ae0
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/cephfs/core/clone.go
View File

@ -68,11 +68,10 @@ func (s *subVolumeClient) CreateCloneFromSubvolume(
return err return err
} }
// if cloneErr is not nil we will delete the snapshot
var cloneErr error
defer func() { defer func() {
if cloneErr != nil { // if any error occurs while cloning, resizing or deleting the snapshot
// fails then we need to delete the clone and snapshot.
if err != nil && !cerrors.IsCloneRetryError(err) {
if err = s.PurgeVolume(ctx, true); err != nil { if err = s.PurgeVolume(ctx, true); err != nil {
log.ErrorLog(ctx, "failed to delete volume %s: %v", s.VolID, err) log.ErrorLog(ctx, "failed to delete volume %s: %v", s.VolID, err)
} }
@ -81,18 +80,19 @@ func (s *subVolumeClient) CreateCloneFromSubvolume(
} }
} }
}() }()
cloneErr = snapClient.CloneSnapshot(ctx, s.SubVolume) err = snapClient.CloneSnapshot(ctx, s.SubVolume)
if cloneErr != nil { if err != nil {
log.ErrorLog(ctx, "failed to clone snapshot %s %s to %s %v", parentvolOpt.VolID, snapshotID, s.VolID, cloneErr) log.ErrorLog(ctx, "failed to clone snapshot %s %s to %s %v", parentvolOpt.VolID, snapshotID, s.VolID, err)
return cloneErr return err
} }
cloneState, cloneErr := s.GetCloneState(ctx) var cloneState cephFSCloneState
if cloneErr != nil { cloneState, err = s.GetCloneState(ctx)
log.ErrorLog(ctx, "failed to get clone state: %v", cloneErr) if err != nil {
log.ErrorLog(ctx, "failed to get clone state: %v", err)
return cloneErr return err
} }
err = cloneState.ToError() err = cloneState.ToError()
@ -157,7 +157,6 @@ func (s *subVolumeClient) CreateCloneFromSnapshot(
} }
} }
}() }()
cloneState, err := s.GetCloneState(ctx) cloneState, err := s.GetCloneState(ctx)
if err != nil { if err != nil {
log.ErrorLog(ctx, "failed to get clone state: %v", err) log.ErrorLog(ctx, "failed to get clone state: %v", err)