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

Signed-off-by: Niels de Vos <[email protected]>
ceph · Jan 22, 2025 · dc15f2f · dc15f2f
1 parent 649e16b
commit dc15f2f
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go
@@ -957,12 +957,17 @@ func (cs *ControllerServer) DeleteVolume(
 		return &csi.DeleteVolumeResponse{}, nil
 	}
 
-	rbdVol, err := GenVolFromVolID(ctx, volumeID, cr, req.GetSecrets())
-	defer func() {
-		if rbdVol != nil {
-			rbdVol.Destroy(ctx)
-		}
-	}()
+	mgr := NewManager(cs.Driver.GetInstanceID(), nil, req.GetSecrets())
+	defer mgr.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 {
 		return cs.checkErrAndUndoReserve(ctx, err, volumeID, rbdVol, cr)
 	}