DeviceManager: Return no error if the device not found while deleting

Discussion on issue intel#413, raised a requirement that PMEM-CSI should handle the
DeleteVolume() call for volumes that the underlined device already deleted
manually by the admin.  So for such a volume we just ignore and return no error
in DeviceManager.DeleteVolume(). This also makes DeleteVolume() idempotent.

Author: avalluri

pkg/pmem-device-manager/pmd-lvm.go

@@ -2,12 +2,14 @@ package pmdmanager
 
 import (
 	"fmt"
+	"os"
 	"strconv"
 	"strings"
 	"sync"
 
 	"github.com/intel/pmem-csi/pkg/ndctl"
 	pmemexec "github.com/intel/pmem-csi/pkg/pmem-exec"
+	"github.com/pkg/errors"
 	"k8s.io/klog"
 )
 
@@ -151,11 +153,22 @@ func (lvm *pmemLvm) DeleteDevice(volumeId string, flush bool) error {
 	lvmMutex.Lock()
 	defer lvmMutex.Unlock()
 
-	device, err := lvm.getDevice(volumeId)
-	if err != nil {
+	var err error
+	var device PmemDeviceInfo
+
+	if device, err = lvm.getDevice(volumeId); err != nil {
+		if os.IsNotExist(errors.Cause(err)) {
+			return nil
+		}
 		return err
 	}
-	if err := ClearDevice(device, flush); err != nil {
+
+	if err = ClearDevice(device, flush); err != nil {
+		if os.IsNotExist(errors.Cause(err)) {
+			// Remove device from cache
+			delete(lvm.devices, volumeId)
+			return nil
+		}
 		return err
 	}
 
@@ -193,7 +206,7 @@ func (lvm *pmemLvm) getDevice(volumeId string) (PmemDeviceInfo, error) {
 		return dev, nil
 	}
 
-	return PmemDeviceInfo{}, fmt.Errorf("Device not found with name %s", volumeId)
+	return PmemDeviceInfo{}, errors.Wrapf(os.ErrNotExist, "no device found with id %s", volumeId)
 }
 
 func getUncachedDevice(volumeId string, volumeGroup string) (PmemDeviceInfo, error) {
@@ -205,7 +218,7 @@ func getUncachedDevice(volumeId string, volumeGroup string) (PmemDeviceInfo, err
 	if dev, ok := devices[volumeId]; ok {
 		return dev, nil
 	}
-	return PmemDeviceInfo{}, fmt.Errorf("Device not found with name %s", volumeId)
+	return PmemDeviceInfo{}, errors.Wrapf(os.ErrNotExist, "no device found with id %s", volumeId)
 }
 
 // listDevices Lists available logical devices in given volume groups

pkg/pmem-device-manager/pmd-ndctl.go

@@ -2,6 +2,7 @@ package pmdmanager
 
 import (
 	"fmt"
+	"os"
 	"sync"
 
 	"github.com/intel/pmem-csi/pkg/ndctl"
@@ -140,10 +141,16 @@ func (pmem *pmemNdctl) DeleteDevice(volumeId string, flush bool) error {
 
 	device, err := pmem.getDevice(volumeId)
 	if err != nil {
+		if os.IsNotExist(err) {
+			return nil
+		}
 		return err
 	}
-	err = ClearDevice(device, flush)
-	if err != nil {
+	if err := ClearDevice(device, flush); err != nil {
+		// Device might have already deleted
+		if os.IsNotExist(err) {
+			return nil
+		}
 		return err
 	}
 	return pmem.ctx.DestroyNamespaceByName(volumeId)