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

cephfs: check ENOTEMPTY when removing subvolume

Browse Source 
return a proper error message to the user when
the subvolume has the snapshots and it cannot
be removed until the snapshots on the subvolume
have to be deleted.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
(cherry picked from commit 89b326c896)
This commit is contained in:
Madhu Rajanna 2020-09-21 11:08:14 +05:30 committed by mergify[bot]
parent cb7c3080cd
commit 764e33f249
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/cephfs/controllerserver.go
View File

@ -343,7 +343,10 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
if err = purgeVolume(ctx, volumeID(vID.FsSubvolName), cr, volOptions, false); err != nil { if err = purgeVolume(ctx, volumeID(vID.FsSubvolName), cr, volOptions, false); err != nil {
util.ErrorLog(ctx, "failed to delete volume %s: %v", volID, err) util.ErrorLog(ctx, "failed to delete volume %s: %v", volID, err)
// All errors other than ErrVolumeNotFound should return an error back to the caller if errors.Is(err, ErrVolumeHasSnapshots) {
return nil, status.Error(codes.FailedPrecondition, err.Error())
}
if !errors.Is(err, ErrVolumeNotFound) { if !errors.Is(err, ErrVolumeNotFound) {
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }

5
internal/cephfs/errors.go
View File

@ -31,6 +31,8 @@ const (
snapNotFound = "Error ENOENT" snapNotFound = "Error ENOENT"
// snapProtectionExist is returned when the snapshot is already protected // snapProtectionExist is returned when the snapshot is already protected
snapProtectionExist = "Error EEXIST" snapProtectionExist = "Error EEXIST"
// volumeNotEmpty is returned when the volume is not empty.
volumeNotEmpty = "Error ENOTEMPTY"
) )
var ( var (
@ -56,4 +58,7 @@ var (
// ErrInvalidCommand is returned when a command is not known to the cluster // ErrInvalidCommand is returned when a command is not known to the cluster
ErrInvalidCommand = errors.New("invalid command") ErrInvalidCommand = errors.New("invalid command")
// ErrVolumeHasSnapshots is returned when a subvolume has snapshots.
ErrVolumeHasSnapshots = errors.New("volume has snapshots")
) )

3
internal/cephfs/volume.go
View File

@ -261,6 +261,9 @@ func purgeVolume(ctx context.Context, volID volumeID, cr *util.Credentials, volO
err := execCommandErr(ctx, "ceph", arg...) err := execCommandErr(ctx, "ceph", arg...)
if err != nil { if err != nil {
util.ErrorLog(ctx, "failed to purge subvolume %s(%s) in fs %s", string(volID), err, volOptions.FsName) util.ErrorLog(ctx, "failed to purge subvolume %s(%s) in fs %s", string(volID), err, volOptions.FsName)
if strings.Contains(err.Error(), volumeNotEmpty) {
return util.JoinErrors(ErrVolumeHasSnapshots, err)
}
if strings.Contains(err.Error(), volumeNotFound) { if strings.Contains(err.Error(), volumeNotFound) {
return util.JoinErrors(ErrVolumeNotFound, err) return util.JoinErrors(ErrVolumeNotFound, err)
} }