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

rbd: fallback to inline image deletion if adding it as a task fails

Browse Source 
Fixes: #858
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-04-09 17:14:43 +02:00 committed by mergify[bot]
parent 22f3dc3556
commit 14276bf642
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/rbd/rbd_util.go
View File

@ -236,16 +236,18 @@ func rbdManagerTaskDeleteImage(ctx context.Context, pOpts *rbdVolume, cr *util.C
output, err := execCommand("ceph", args) output, err := execCommand("ceph", args)
if err != nil { if err != nil {
if strings.Contains(string(output), rbdTaskRemoveCmdInvalidString1) && switch {
strings.Contains(string(output), rbdTaskRemoveCmdInvalidString2) { case strings.Contains(string(output), rbdTaskRemoveCmdInvalidString1) &&
strings.Contains(string(output), rbdTaskRemoveCmdInvalidString2):
klog.Warningf(util.Log(ctx, "cluster with cluster ID (%s) does not support Ceph manager based rbd image"+ klog.Warningf(util.Log(ctx, "cluster with cluster ID (%s) does not support Ceph manager based rbd image"+
" deletion (minimum ceph version required is v14.2.3)"), pOpts.ClusterID) " deletion (minimum ceph version required is v14.2.3)"), pOpts.ClusterID)
return false, err case strings.HasPrefix(string(output), rbdTaskRemoveCmdAccessDeniedMessage):
} else if strings.HasPrefix(string(output), rbdTaskRemoveCmdAccessDeniedMessage) {
klog.Warningf(util.Log(ctx, "access denied to Ceph MGR-based RBD image deletion "+ klog.Warningf(util.Log(ctx, "access denied to Ceph MGR-based RBD image deletion "+
"on cluster ID (%s)"), pOpts.ClusterID) "on cluster ID (%s)"), pOpts.ClusterID)
return false, err default:
klog.Warningf(util.Log(ctx, "uncaught error while scheduling an image deletion task: %s"), err)
} }
return false, err
} }
return true, err return true, err