Improve error handling

2022-08-04 21:52:07 +02:00
parent 1a58d00221
commit 80aa03d85e
2 changed files with 24 additions and 8 deletions
@@ -273,14 +273,16 @@ func (d *iscsiDriver) mountVolume(v *iscsiVolume) error {
 		return err
 	}

-	// Login to iSCSI Target
-	err = iSCSI.LoginTarget(v.TargetIQN, v.Host)
-	if err != nil {
-		return err
-	}
+	if !iSCSI.TargetLoggedIn(v.TargetIQN) {
+		// Login to iSCSI Target
+		err = iSCSI.LoginTarget(v.TargetIQN, v.Host)
+		if err != nil {
+			return err
+		}

-	// Wait for Physical Volume to appear
-	time.Sleep(500 * time.Millisecond)
+		// Wait for Physical Volume to appear
+		time.Sleep(500 * time.Millisecond)
+	}

 	out := ""
 	errMsg := ""
@@ -376,7 +378,7 @@ func (d *iscsiDriver) unmountVolume(v *iscsiVolume) error {
 	}
 	if len(errMsg) > 0 {
 		err := fmt.Errorf("Unable to Unmount Volume: %s", errMsg)
-		return err
+		logrus.Info(err)
 	}

 	// Logout from iSCSI Target