Merge pull request #5 from Seagate/fix/device-mapper

fix: Added device-mapper calls to remove and clear dm

Author: jskazinski

iscsi/iscsi.go

@@ -105,6 +105,7 @@ func parseSessions(lines string) []iscsiSession {
 }
 
 func sessionExists(tgtPortal, tgtIQN string) (bool, error) {
+	debug.Printf("Begin sessionExists (%s/%s)...\n", tgtIQN, tgtPortal)
 	sessions, err := getCurrentSessions()
 	if err != nil {
 		return false, err
@@ -147,6 +148,7 @@ func waitForPathToExist(devicePath *string, maxRetries, intervalSeconds int, dev
 }
 
 func waitForPathToExistImpl(devicePath *string, maxRetries, intervalSeconds int, deviceTransport string, osStat statFunc, filepathGlob globFunc) (bool, error) {
+	debug.Printf("waitForPathToExistImpl (%v)", *devicePath)
 	if devicePath == nil || *devicePath == "" {
 		return false, fmt.Errorf("unable to check nil or unspecified devicePath")
 	}
@@ -197,6 +199,8 @@ func getMultipathDisk(path string) (string, error) {
 		return "", err
 	}
 	sdevice := filepath.Base(devicePath)
+	debug.Printf("-- devicePath=%s, sdevice=%s", devicePath, sdevice)
+
 	// If destination directory is already identified as a multipath device,
 	// just return its path
 	if strings.HasPrefix(sdevice, "dm-") {
@@ -207,13 +211,14 @@ func getMultipathDisk(path string) (string, error) {
 	// check to see if any have an entry under /sys/block/dm-*/slaves matching
 	// the device the symlink was pointing at
 	dmPaths, err := filepath.Glob("/sys/block/dm-*")
+	debug.Printf("-- dmPaths=%v", dmPaths)
 	if err != nil {
 		debug.Printf("Glob error: %s", err)
 		return "", err
 	}
 	for _, dmPath := range dmPaths {
 		sdevices, err := filepath.Glob(filepath.Join(dmPath, "slaves", "*"))
-		debug.Printf("dmPath=%v, sdevices=%v", dmPath, sdevices)
+		debug.Printf("dmPath=%v/slaves/*, sdevices=%v", dmPath, sdevices)
 		if err != nil {
 			debug.Printf("Glob error: %s", err)
 		}
@@ -224,7 +229,7 @@ func getMultipathDisk(path string) (string, error) {
 				// We've found a matching entry, return the path for the
 				// dm-* device it was found under
 				p := filepath.Join("/dev", filepath.Base(dmPath))
-				debug.Printf("Found matching multipath device: %s under dm-* device path %s", sdevice, dmPath)
+				debug.Printf("Found matching multipath device (%s) under dm-* device path (%s), (%v)", sdevice, dmPath, p)
 				return p, nil
 			}
 		}
@@ -236,6 +241,7 @@ func getMultipathDisk(path string) (string, error) {
 // Connect attempts to connect a volume to this node using the provided Connector info
 func Connect(c *Connector) (string, error) {
 	var lastErr error
+	debug.Printf("Begin iSCSI Connect (dDoDiscovery=%v)...\n", c.DoDiscovery)
 	if c.RetryCount == 0 {
 		c.RetryCount = 10
 	}

iscsi/iscsiadm.go

@@ -83,14 +83,14 @@ func ListInterfaces() ([]string, error) {
 // ShowInterface retrieves the details for the specified iscsi interface
 // caller should inspect r.Err and use r.StdOut for interface details
 func ShowInterface(iface string) (string, error) {
-	debug.Println("Begin ShowInterface...")
+	debug.Printf("Begin ShowInterface (%s)...\n", iface)
 	out, err := iscsiCmd("-m", "iface", "-o", "show", "-I", iface)
 	return out, err
 }
 
 // CreateDBEntry sets up a node entry for the specified tgt in the nodes iscsi nodes db
 func CreateDBEntry(tgtIQN, portal, iFace string, discoverySecrets, sessionSecrets Secrets) error {
-	debug.Println("Begin CreateDBEntry...")
+	debug.Printf("Begin CreateDBEntry (%s)...\n", portal)
 	baseArgs := []string{"-m", "node", "-T", tgtIQN, "-p", portal}
 	_, err := iscsiCmd(append(baseArgs, []string{"-I", iFace, "-o", "new"}...)...)
 	if err != nil {
@@ -197,7 +197,7 @@ func Logout(tgtIQN string, portals []string) error {
 	debug.Println("Begin Logout...")
 	baseArgs := []string{"-m", "node", "-T", tgtIQN}
 	for _, p := range portals {
-		debug.Printf("attempting logout for portal: %s", p)
+		debug.Printf("attempting logout (%s) for portal: %s", tgtIQN, p)
 		args := append(baseArgs, []string{"-p", p, "-u"}...)
 		iscsiCmd(args...)
 	}

iscsi/multipath.go

@@ -71,15 +71,19 @@ func GetSysDevicesFromMultipathDevice(device string) ([]string, error) {
 func FlushMultipathDevice(device string) error {
 	debug.Printf("Flushing multipath device %q\n", device)
 
-	fullDevice := device
+	err := RemoveAndClear(device)
+	if err != nil {
+		debug.Printf("device-mapper remove and clear device %q error=%v\n", device, err)
+	}
+
 	timeout := 5 * time.Second
-	_, err := execWithTimeout("multipath", []string{"-f", fullDevice}, timeout)
+	_, err = execWithTimeout("multipath", []string{"-f", device}, timeout)
 
 	if err != nil {
-		if _, e := os.Stat(fullDevice); os.IsNotExist(e) {
+		if _, e := os.Stat(device); os.IsNotExist(e) {
 			debug.Printf("Multipath device %q was deleted\n", device)
 		} else {
-			debug.Printf("Command 'multipath -f %v' did not succeed to delete the device: %v\n", fullDevice, err)
+			debug.Printf("Command 'multipath -f %v' did not succeed to delete the device: %v\n", device, err)
 			return err
 		}
 	}
@@ -98,3 +102,24 @@ func ResizeMultipathDevice(device string) error {
 
 	return nil
 }
+
+// RemoveAndClear calls 'dmsetup' to remove and clear a device entry
+func RemoveAndClear(device string) error {
+	debug.Printf("Remove and clear multipath device (%s)\n", device)
+
+	// Remove device-mapper logical device
+	if output, err := execCommand("dmsetup", "remove", "-f", device).CombinedOutput(); err != nil {
+		return fmt.Errorf("device-mapper could not remove device: %s (%v)", output, err)
+	}
+
+	// Clear out device-mapper logical device if it still exists
+	if _, e := os.Stat(device); os.IsNotExist(e) {
+		debug.Printf("device-mapper logical device %q was removed\n", device)
+	} else {
+		if output, err := execCommand("dmsetup", "clear", device).CombinedOutput(); err != nil {
+			return fmt.Errorf("device-mapper could not clear device: %s (%v)", output, err)
+		}
+	}
+
+	return nil
+}