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

cephfs: make deleteSnapshot() a method of volumeOptions

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-11-04 14:21:22 +01:00 committed by mergify[bot]
parent 5883f244d2
commit 032db78d8a
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/cephfs/clone.go
View File

@ -58,7 +58,7 @@ func createCloneFromSubvolume(ctx context.Context, volID, cloneID volumeID, volO
) )
defer func() { defer func() {
if protectErr != nil { if protectErr != nil {
err = deleteSnapshot(ctx, parentvolOpt, cr, snapshotID, volID) err = parentvolOpt.deleteSnapshot(ctx, cr, snapshotID, volID)
if err != nil { if err != nil {
util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapshotID, err) util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapshotID, err)
} }
@ -76,7 +76,7 @@ func createCloneFromSubvolume(ctx context.Context, volID, cloneID volumeID, volO
util.ErrorLog(ctx, "failed to unprotect snapshot %s %v", snapshotID, err) util.ErrorLog(ctx, "failed to unprotect snapshot %s %v", snapshotID, err)
} }
} }
if err = deleteSnapshot(ctx, parentvolOpt, cr, snapshotID, volID); err != nil { if err = parentvolOpt.deleteSnapshot(ctx, cr, snapshotID, volID); err != nil {
util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapshotID, err) util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapshotID, err)
} }
} }
@ -126,7 +126,7 @@ func createCloneFromSubvolume(ctx context.Context, volID, cloneID volumeID, volO
return err return err
} }
} }
if err = deleteSnapshot(ctx, parentvolOpt, cr, snapshotID, volID); err != nil { if err = parentvolOpt.deleteSnapshot(ctx, cr, snapshotID, volID); err != nil {
util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapshotID, err) util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapshotID, err)
return err return err
} }
@ -153,7 +153,7 @@ func cleanupCloneFromSubvolumeSnapshot(ctx context.Context, volID, cloneID volum
return err return err
} }
} }
err = deleteSnapshot(ctx, parentVolOpt, cr, snapShotID, volID) err = parentVolOpt.deleteSnapshot(ctx, cr, snapShotID, volID)
if err != nil { if err != nil {
util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapShotID, err) util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapShotID, err)
return err return err

4
internal/cephfs/controllerserver.go
View File

@ -594,7 +594,7 @@ func doSnapshot(ctx context.Context, volOpt *volumeOptions, subvolumeName, snaps
} }
defer func() { defer func() {
if err != nil { if err != nil {
dErr := deleteSnapshot(ctx, volOpt, cr, snapID, volID) dErr := volOpt.deleteSnapshot(ctx, cr, snapID, volID)
if dErr != nil { if dErr != nil {
util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapID, err) util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapID, err)
} }
@ -711,7 +711,7 @@ func (cs *ControllerServer) DeleteSnapshot(ctx context.Context, req *csi.DeleteS
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }
} }
err = deleteSnapshot(ctx, volOpt, cr, volumeID(sid.FsSnapshotName), volumeID(sid.FsSubvolName)) err = volOpt.deleteSnapshot(ctx, cr, volumeID(sid.FsSnapshotName), volumeID(sid.FsSubvolName))
if err != nil { if err != nil {
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }

2
internal/cephfs/fsjournal.go
View File

@ -354,7 +354,7 @@ func checkSnapExists(
defer func() { defer func() {
if err != nil { if err != nil {
err = deleteSnapshot(ctx, volOptions, cr, volumeID(snapID), volumeID(parentSubVolName)) err = volOptions.deleteSnapshot(ctx, cr, volumeID(snapID), volumeID(parentSubVolName))
if err != nil { if err != nil {
util.ErrorLog(ctx, "failed to delete snapshot %s: %v", snapID, err) util.ErrorLog(ctx, "failed to delete snapshot %s: %v", snapID, err)
return return

10
internal/cephfs/snapshot.go
View File

@ -61,18 +61,18 @@ func (vo *volumeOptions) createSnapshot(ctx context.Context, snapID, volID volum
return nil return nil
} }
func deleteSnapshot(ctx context.Context, volOptions *volumeOptions, cr *util.Credentials, snapID, volID volumeID) error { func (vo *volumeOptions) deleteSnapshot(ctx context.Context, cr *util.Credentials, snapID, volID volumeID) error {
args := []string{ args := []string{
"fs", "fs",
"subvolume", "subvolume",
"snapshot", "snapshot",
"rm", "rm",
volOptions.FsName, vo.FsName,
string(volID), string(volID),
string(snapID), string(snapID),
"--group_name", "--group_name",
volOptions.SubvolumeGroup, vo.SubvolumeGroup,
"-m", volOptions.Monitors, "-m", vo.Monitors,
"-c", util.CephConfigPath, "-c", util.CephConfigPath,
"-n", cephEntityClientPrefix + cr.ID, "-n", cephEntityClientPrefix + cr.ID,
"--keyfile=" + cr.KeyFile, "--keyfile=" + cr.KeyFile,
@ -84,7 +84,7 @@ func deleteSnapshot(ctx context.Context, volOptions *volumeOptions, cr *util.Cre
"ceph", "ceph",
args[:]...) args[:]...)
if err != nil { if err != nil {
util.ErrorLog(ctx, "failed to delete subvolume snapshot %s %s(%s) in fs %s", string(snapID), string(volID), err, volOptions.FsName) util.ErrorLog(ctx, "failed to delete subvolume snapshot %s %s(%s) in fs %s", string(snapID), string(volID), err, vo.FsName)
return err return err
} }
return nil return nil