mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-01-31 09:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: use rbd.Manager within ControllerServer.DeleteVolume()

Browse Source 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2025-01-20 18:14:10 +01:00
parent 075abcac67
commit 923e1e3af5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/rbd/controllerserver.go
View File

@ -957,12 +957,17 @@ func (cs *ControllerServer) DeleteVolume(
return &csi.DeleteVolumeResponse{}, nil return &csi.DeleteVolumeResponse{}, nil
} }
rbdVol, err := GenVolFromVolID(ctx, volumeID, cr, req.GetSecrets()) mgr := NewManager(cs.Driver.GetInstanceID(), nil, req.GetSecrets())
defer func() { defer mgr.Destroy(ctx)
if rbdVol != nil {
rbdVol.Destroy(ctx) vol, err := mgr.GetVolumeByID(ctx, volumeID)
if vol != nil {
defer vol.Destroy(ctx)
}
rbdVol, ok := vol.(*rbdVolume) // FIXME: temporary cast until rbdVolume is cleaned up
if !ok {
return nil, status.Error(codes.Internal, "BUG: failed to cast Volume to rbdVolume")
} }
}()
if err != nil { if err != nil {
return cs.checkErrAndUndoReserve(ctx, err, volumeID, rbdVol, cr) return cs.checkErrAndUndoReserve(ctx, err, volumeID, rbdVol, cr)
} }