mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-14 18:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfs: make DeleteVolume (more) idempotent

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos
2022-07-19 17:09:37 +02:00
committed by mergify[bot]
parent a6cd56ae7e
commit 0a173a8a9e
3 changed files with 68 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/nfs/controller/controllerserver.go
View File

@ -18,7 +18,7 @@ package controller
import (
"context"
"strings"
"errors"
"github.com/ceph/ceph-csi/internal/cephfs"
"github.com/ceph/ceph-csi/internal/cephfs/store"
@ -147,11 +147,11 @@ func (cs *Server) DeleteVolume(
err = nfsVolume.DeleteExport()
// if the export does not exist, continue with deleting the backend volume
if err != nil && !strings.Contains(err.Error(), "Export does not exist") {
if err != nil && !errors.Is(err, ErrNotFound) {
return nil, status.Errorf(codes.InvalidArgument, "failed to delete export: %v", err)
}
log.DebugLog(ctx, "deleted NFS-export: %s", nfsVolume)
log.DebugLog(ctx, "NFS-export %q has been deleted", nfsVolume)
return cs.backendServer.DeleteVolume(ctx, req)
}