rbd: fixed csi-rbdplugin crashes when decoding volume ID failed

Signed-off-by: HF <crazytaxii666@gmail.com>
ceph · Sep 4, 2023 · b23d8fc · b23d8fc
1 parent 683821c
commit b23d8fc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go
@@ -922,10 +922,10 @@ func (cs *ControllerServer) DeleteVolume(
 	}
 
 	rbdVol, err := GenVolFromVolID(ctx, volumeID, cr, req.GetSecrets())
-	defer rbdVol.Destroy()
 	if err != nil {
 		return cs.checkErrAndUndoReserve(ctx, err, volumeID, rbdVol, cr)
 	}
+	defer rbdVol.Destroy()
 
 	// lock out parallel create requests against the same volume name as we
 	// clean up the image and associated omaps for the same