fix: remove encrypted dm device with linear dm if existing

ref: longhorn/longhorn 12842

Signed-off-by: James Lu <james.lu@suse.com>

Author: mantissahz

app/cmd/dmsetup/dmsetup.go

@@ -207,7 +207,7 @@ func remove(c *cli.Context) error {
 
 	logrus.Infof("Removing device %v with force %v and deferred %v", deviceName, c.Bool("force"), c.Bool("deferred"))
 
-	return util.DmsetupRemove(deviceName, c.Bool("force"), c.Bool("deferred"), executor)
+	return util.DmsetupRemove([]string{deviceName}, c.Bool("force"), c.Bool("deferred"), executor)
 }
 
 func DepsCmd() cli.Command {

pkg/initiator/initiator.go

@@ -1226,9 +1226,44 @@ func (i *Initiator) removeLinearDmDevice(force, deferred bool) error {
 	if _, err := os.Stat(dmDevPath); err != nil {
 		return err
 	}
+	dmDevList := []string{dmDevPath}
+
+	// Encrypted volume will create another dm device with "-encrypted" suffix,
+	// and this dm device will block the removal of the linear dm device until it's removed.
+	// So we need to remove the encrypted dm device together with the linear dm device,
+	encryptedDmDevPath := fmt.Sprintf("%s-encrypted", dmDevPath)
+	isEncryptedDmDevExist := true
+	if _, err := os.Stat(encryptedDmDevPath); err != nil {
+		if !os.IsNotExist(err) {
+			return err
+		}
+		isEncryptedDmDevExist = false
+	}
+	if isEncryptedDmDevExist {
+		dmDevList = append(dmDevList, encryptedDmDevPath)
+		force = true
+	}
+	i.logger.Infof("Removing linear dm device %v", dmDevList)
+	if err := util.DmsetupRemove(dmDevList, force, deferred, i.executor); err != nil {
+		i.logger.WithError(err).Debugf("Failed to remove linear dm devices: %v", dmDevList)
+		if isRemoveDmDevNotFoundError(err) {
+			return nil
+		}
+		return err
+	}
+
+	return nil
+}
+
+func isRemoveDmDevNotFoundError(err error) bool {
+	if err == nil {
+		return false
+	}
 
-	i.logger.Info("Removing linear dm device")
-	return util.DmsetupRemove(i.Name, force, deferred, i.executor)
+	errMsg := strings.ToLower(err.Error())
+	return strings.Contains(errMsg, "no such device or address") ||
+		strings.Contains(errMsg, "not found") ||
+		strings.Contains(errMsg, "no such file or directory")
 }
 
 func (i *Initiator) createLinearDmDevice() error {

pkg/util/dmsetup.go

@@ -60,11 +60,13 @@ func DmsetupReload(dmDeviceName, table string, executor *commonns.Executor) erro
 	return err
 }
 
-// DmsetupRemove removes the device mapper device with the given name
-func DmsetupRemove(dmDeviceName string, force, deferred bool, executor *commonns.Executor) error {
+// DmsetupRemove removes one or more device mapper devices with the given names
+func DmsetupRemove(dmDeviceNameList []string, force, deferred bool, executor *commonns.Executor) error {
 	opts := []string{
-		"remove", dmDeviceName,
+		"remove",
 	}
+	opts = append(opts, dmDeviceNameList...)
+
 	if force {
 		opts = append(opts, "--force")
 	}