Storage: Delete potentially left snapshot temporary volume

lxd/storage/connectors/connector_iscsi.go

@@ -50,7 +50,7 @@ func (c *connectorISCSI) Version() (string, error) {
 
 	fields := strings.Split(strings.TrimSpace(out), " ")
 	if strings.HasPrefix(out, "iscsiadm version ") && len(fields) > 2 {
-		version := fmt.Sprintf("%s (iscsiadm)", fields[2])
+		version := fields[2] + " (iscsiadm)"
 		return version, nil
 	}
 
@@ -97,8 +97,7 @@ func (c *connectorISCSI) QualifiedName() (string, error) {
 
 // discoverTargets discovers the available iSCSI targets on a given address.
 func (c *connectorISCSI) discoverTargets(ctx context.Context, targetAddr string) error {
-	// Discover the available iSCSI targets on a given address.
-	_, _, err := shared.RunCommandSplit(ctx, nil, nil, "iscsiadm", "--mode", "discovery", "--type", "sendtargets", "--portal", targetAddr)
+	_, err := shared.RunCommandContext(ctx, "iscsiadm", "--mode", "discovery", "--type", "sendtargets", "--portal", targetAddr)
 	if err != nil {
 		return fmt.Errorf("Failed to discover available iSCSI targets on %q: %w", targetAddr, err)
 	}

lxd/storage/drivers/driver_pure_util.go

@@ -950,7 +950,7 @@ func (p *pureClient) restoreVolumeSnapshot(poolName string, volName string, snap
 // copyVolumeSnapshot copies the volume snapshot into destination volume. Destination volume is overwritten
 // if already exists.
 func (p *pureClient) copyVolumeSnapshot(srcPoolName string, srcVolName string, srcSnapshotName string, dstPoolName string, dstVolName string) error {
-	return p.copyVolume(srcPoolName, fmt.Sprintf("%s.%s", srcVolName, srcSnapshotName), dstPoolName, dstVolName, true)
+	return p.copyVolume(srcPoolName, srcVolName+"."+srcSnapshotName, dstPoolName, dstVolName, true)
 }
 
 // getHosts retrieves an existing Pure Storage host.
@@ -1365,7 +1365,7 @@ func (d *pure) unmapVolume(vol Volume) error {
 		if connector.Type() == connectors.TypeISCSI {
 			// removeDevice removes device from the system if the device is removable.
 			removeDevice := func(devName string) error {
-				path := fmt.Sprintf("/sys/block/%s/device/delete", devName)
+				path := "/sys/block/" + devName + "/device/delete"
 				if shared.PathExists(path) {
 					// Delete device.
 					err := os.WriteFile(path, []byte("1"), 0400)
@@ -1381,7 +1381,7 @@ func (d *pure) unmapVolume(vol Volume) error {
 			if strings.HasPrefix(devName, "dm-") {
 				// Multipath device (/dev/dm-*) itself is not removable.
 				// Therefore, we remove its slaves instead.
-				slaves, err := filepath.Glob(fmt.Sprintf("/sys/block/%s/slaves/*", devName))
+				slaves, err := filepath.Glob("/sys/block/" + devName + "/slaves/*")
 				if err != nil {
 					return fmt.Errorf("Failed to unmap volume %q: Failed to list slaves for device %q: %w", vol.name, devName, err)
 				}
@@ -1488,7 +1488,7 @@ func (d *pure) getMappedDevPath(vol Volume, mapVolume bool) (string, revert.Hook
 		// - "00"             - Padding
 		// - "8726b5033af243" - First 14 characters of serial number
 		// - "24a937"         - OUI (Organizationally Unique Identifier)
-		// - "3d00014196"     - Last 10 characters of serail number
+		// - "3d00014196"     - Last 10 characters of serial number
 		diskSuffix = "00" + pureVol.Serial[0:14] + "24a937" + pureVol.Serial[14:]
 	default:
 		return "", nil, fmt.Errorf("Unsupported Pure Storage mode %q", connector.Type())
@@ -1532,18 +1532,18 @@ func (d *pure) getVolumeName(vol Volume) (string, error) {
 	// Search for the volume type prefix, and if found, prepend it to the volume name.
 	volumeTypePrefix, ok := pureVolTypePrefixes[vol.volType]
 	if ok {
-		volName = fmt.Sprintf("%s-%s", volumeTypePrefix, volName)
+		volName = volumeTypePrefix + "-" + volName
 	}
 
 	// Search for the content type suffix, and if found, append it to the volume name.
 	contentTypeSuffix, ok := pureContentTypeSuffixes[vol.contentType]
 	if ok {
-		volName = fmt.Sprintf("%s-%s", volName, contentTypeSuffix)
+		volName = volName + "-" + contentTypeSuffix
 	}
 
 	// If volume is snapshot, prepend snapshot prefix to its name.
 	if vol.IsSnapshot() {
-		volName = fmt.Sprintf("%s%s", pureSnapshotPrefix, volName)
+		volName = pureSnapshotPrefix + volName
 	}
 
 	return volName, nil

lxd/storage/drivers/driver_pure_volumes.go

@@ -1221,6 +1221,23 @@ func (d *pure) DeleteVolumeSnapshot(snapVol Volume, op *operations.Operation) er
 		return err
 	}
 
+	// Snapshots cannot be mounted directly, so when this is needed, the snapshot is copied
+	// into a temporary volume. In case LXD was abruptly stopped in the moment when
+	// temporary volume was created, it is possible that the volume was not removed.
+	tmpVol, err := d.client().getVolume(snapVol.pool, snapVolName)
+	if err != nil && !api.StatusErrorCheck(err, http.StatusNotFound) {
+		return fmt.Errorf("Failed retrieving temporary snapshot volume: %w", err)
+	}
+
+	if tmpVol != nil {
+		// Temporary volume found, delete it.
+		err = d.client().deleteVolume(snapVol.pool, snapVolName)
+		if err != nil {
+			return fmt.Errorf("Failed deleting temporary snapshot volume: %w", err)
+		}
+	}
+
+	// Delete snapshot.
 	err = d.client().deleteVolumeSnapshot(snapVol.pool, parentVolName, snapVolName)
 	if err != nil {
 		return err