Merge pull request #1012 from himanshuvar/Bug-Fix

Bug Fix: For Volume Attachment to OpenSDS CSI plugin
sodafoundation · Sep 23, 2019 · 089dca6 · 089dca6
2 parents bc79715 + c717dff
commit 089dca6
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/contrib/connector/iscsi/helper.go b/contrib/connector/iscsi/helper.go
@@ -248,14 +248,18 @@ func connect(connMap map[string]interface{}) (string, error) {
 
 	targetlun := strconv.Itoa(conn.TgtLun)
 
-	cmd := "pgrep -f /sbin/iscsid"
-	_, err = connector.ExecCmd("/bin/bash", "-c", cmd)
+    cmd := "ls -ali / | sed '2!d' |awk {'print $1'}"
+    INODE_NUM, err := connector.ExecCmd("/bin/bash", "-c", cmd)
+    if err != nil && INODE_NUM == "2" {
+		cmd = "\"pgrep -f /sbin/iscsid\""
+		_, err = connector.ExecCmd("/bin/bash", "-c", cmd)
 
-	if err != nil {
-		cmd = "/sbin/iscsid"
-		_, errExec := connector.ExecCmd("/bin/bash", "-c", cmd)
-		if errExec != nil {
-			return "", fmt.Errorf("Please stop the iscsi process outside the container first: %v", errExec)
+		if err != nil {
+			cmd = "/sbin/iscsid"
+			_, errExec := connector.ExecCmd("/bin/bash", "-c", cmd)
+			if errExec != nil {
+				return "", fmt.Errorf("Please stop the iscsi process: %v", errExec)
+			}
 		}
 	}