fix: reduce multipath delay to 10s, use ExitCode

Signed-off-by: Joe Skazinski <joseph.skazinski@seagate.com>

Author: jskazinski

iscsi/iscsi.go

@@ -19,7 +19,7 @@ import (
 const (
 	defaultPort          = "3260"
 	maxMultipathAttempts = 10
-	multipathDelay       = 30
+	multipathDelay       = 10
 )
 
 var (
@@ -162,7 +162,7 @@ func waitForPathToExistImpl(devicePath *string, maxRetries, intervalSeconds int,
 		err = nil
 		if deviceTransport == "tcp" {
 			_, err = osStat(*devicePath)
-			debug.Printf("os stat device: exist %v device %v", !os.IsNotExist(err), *devicePath)
+			debug.Printf("[%d] os stat device: exist %v device %v", i, !os.IsNotExist(err), *devicePath)
 			if err != nil && !os.IsNotExist(err) {
 				debug.Printf("Error attempting to stat device: %s", err.Error())
 				return false, err
@@ -171,7 +171,7 @@ func waitForPathToExistImpl(devicePath *string, maxRetries, intervalSeconds int,
 			}
 
 		} else {
-			debug.Printf("filepathGlob: %s", *devicePath)
+			debug.Printf("[%d] filepathGlob: %s", i, *devicePath)
 			fpath, _ := filepathGlob(*devicePath)
 			if fpath == nil {
 				err = os.ErrNotExist
@@ -191,6 +191,7 @@ func waitForPathToExistImpl(devicePath *string, maxRetries, intervalSeconds int,
 		}
 		time.Sleep(time.Second * time.Duration(intervalSeconds))
 	}
+	debug.Printf("device does NOT exist [%d*%ds] (%v)", maxRetries, intervalSeconds, *devicePath)
 	return false, err
 }
 

iscsi/multipath.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"syscall"
 	"time"
 )
 
@@ -112,8 +111,8 @@ func RemoveAndClear(device string) error {
 	debug.Printf("dmsetup remove -f %s\n", device)
 	if output, err := execCommand("dmsetup", "remove", "-f", device).CombinedOutput(); err != nil {
 		exitErr, ok := err.(*exec.ExitError)
-		if ok && exitErr.ProcessState.Sys().(syscall.WaitStatus).ExitStatus() != 0 {
-			debug.Printf("ERROR: dmsetup remove -f ExitStatus: %d, err=%v\n", exitErr.ProcessState.Sys().(syscall.WaitStatus).ExitStatus(), err)
+		if ok && exitErr.ExitCode() != 0 {
+			debug.Printf("ERROR: dmsetup remove -f ExitCode: %d, err=%v\n", exitErr.ExitCode(), err)
 		}
 
 		return fmt.Errorf("device-mapper could not remove device: %s (%v)", output, err)