fix: volume name mismatch on DeleteVolume

The stored PropertyCSIVolumeName is the PVC name (e.g. "pvc-xxx")
while meta.Name is the full volume ID ("pool/pvc-xxx"). The delete
ownership check compared these and failed with "volume name mismatch".

Fix: compare stored CSI name against meta.DatasetName (the subvolume
name without pool prefix) instead of meta.Name. Applied consistently
across NFS, iSCSI, and SMB delete paths.

Author: fenio

pkg/driver/controller_iscsi.go

@@ -332,10 +332,9 @@ func (s *ControllerService) verifyISCSIOwnership(ctx context.Context, meta *Volu
 	}
 
 	if volumeName, ok := props[nastyapi.PropertyCSIVolumeName]; ok {
-		nameMatches := volumeName == meta.Name || (isDatasetPathVolumeID(meta.Name) && strings.HasSuffix(meta.Name, "/"+volumeName))
-		if !nameMatches {
+		if volumeName != meta.DatasetName {
 			return "", false, status.Errorf(codes.FailedPrecondition,
-				"Subvolume %s volume name mismatch (stored=%s, requested=%s)", meta.DatasetID, volumeName, meta.Name)
+				"Subvolume %s volume name mismatch (stored=%s, requested=%s)", meta.DatasetID, volumeName, meta.DatasetName)
 		}
 	}
 

pkg/driver/controller_nfs.go

@@ -415,13 +415,15 @@ func (s *ControllerService) deleteNFSVolume(ctx context.Context, meta *VolumeMet
 					"Subvolume %s/%s is not managed by nasty-csi (managed_by=%s)", pool, subvolName, managedBy)
 			}
 
-			// Verify volume name matches
+			// Verify volume name matches — compare stored CSI name against
+			// the subvolume name (DatasetName), not the full volume ID (Name)
+			// which includes the pool prefix.
 			if volumeName, ok := props[nastyapi.PropertyCSIVolumeName]; ok {
-				if volumeName != meta.Name {
-					klog.Errorf("Subvolume %s/%s volume name mismatch: property=%s, requested=%s", pool, subvolName, volumeName, meta.Name)
+				if volumeName != meta.DatasetName {
+					klog.Errorf("Subvolume %s/%s volume name mismatch: property=%s, requested=%s", pool, subvolName, volumeName, meta.DatasetName)
 					timer.ObserveError()
 					return nil, status.Errorf(codes.FailedPrecondition,
-						"Subvolume %s/%s volume name mismatch (stored=%s, requested=%s)", pool, subvolName, volumeName, meta.Name)
+						"Subvolume %s/%s volume name mismatch (stored=%s, requested=%s)", pool, subvolName, volumeName, meta.DatasetName)
 				}
 			}
 

pkg/driver/controller_smb.go

@@ -263,11 +263,10 @@ func (s *ControllerService) deleteSMBVolume(ctx context.Context, meta *VolumeMet
 			}
 
 			if volumeName, ok := props[nastyapi.PropertyCSIVolumeName]; ok {
-				nameMatches := volumeName == meta.Name || (isDatasetPathVolumeID(meta.Name) && strings.HasSuffix(meta.Name, "/"+volumeName))
-				if !nameMatches {
+				if volumeName != meta.DatasetName {
 					timer.ObserveError()
 					return nil, status.Errorf(codes.FailedPrecondition,
-						"Subvolume %s/%s volume name mismatch (stored=%s, requested=%s)", pool, subvolName, volumeName, meta.Name)
+						"Subvolume %s/%s volume name mismatch (stored=%s, requested=%s)", pool, subvolName, volumeName, meta.DatasetName)
 				}
 			}