Merge pull request #477 from yussufsh/main

Improve delete device failure logs in driver node

Author: k8s-ci-robot

pkg/device/multipath.go

@@ -79,39 +79,40 @@ func retryCleanupDevice(dev *Device) error {
 }
 
 // multipathDisableQueuing disable queueing on the multipath device
-func multipathDisableQueuing(mapper string) (err error) {
+func multipathDisableQueuing(mapper string) error {
 	args := []string{"message", mapper, "0", "fail_if_no_path"}
 	outBytes, err := exec.Command(dmsetupcommand, args...).CombinedOutput()
+	out := string(outBytes)
 	if err != nil {
-		return err
+		return fmt.Errorf("cannot disable queuing: %s : %v", out, err)
 	}
-	out := string(outBytes)
 	if strings.Contains(out, deviceDoesNotExist) {
 		return fmt.Errorf("cannot disable queuing: %s", out)
 	}
 	return nil
 }
 
 // multipathRemoveDmDevice remove multipath device via dmsetup
-func multipathRemoveDmDevice(mapper string) (err error) {
+func multipathRemoveDmDevice(mapper string) error {
 	if strings.HasSuffix(mapper, "mpatha") {
 		klog.Warning("skipping remove mpatha which is root")
-		return
+		return nil
 	}
 
-	err = multipathDisableQueuing(mapper)
-	if err != nil {
+	// Any failure while performing disable queuing operation on the device map
+	// will be ignored and will try to delete it.
+	if err := multipathDisableQueuing(mapper); err != nil {
 		klog.Warningf("failure while disabling queue for %s: %v", mapper, err)
 	}
 
 	args := []string{"remove", "--force", mapper}
 	outBytes, err := exec.Command(dmsetupcommand, args...).CombinedOutput()
+	out := string(outBytes)
 	if err != nil {
-		return fmt.Errorf("failed to remove multipath map for %s, error: %v", mapper, err)
+		return fmt.Errorf("failed to remove device map for %s : %s : %v", mapper, out, err)
 	}
-	out := string(outBytes)
 	if isDmsetupRemoveError(out) {
-		return fmt.Errorf("failed to remove device map for %s, error: %s", mapper, out)
+		return fmt.Errorf("failed to remove device map for %s : %s", mapper, out)
 	}
 	return nil
 }