CIDG-1395 : Changed the placement of logoutAndDeleteIscsiTarget() call (#157)

jyotsnalothe · web-flow · commit 7563f6b44c8d · 2021-06-28T06:50:50.000-07:00
* CIDG-1395 : Changed the placement of logoutAndDeleteIscsiTarget() call

Signed-off-by: jyotsna-l &lt;jyotsna.l@hpe.com&gt;

* Reverted the changes for calling logoutAndDeleteIscsiTarget function

Signed-off-by: jyotsna-l &lt;jyotsna.l@hpe.com&gt;
diff --git a/linux/multipath.go b/linux/multipath.go
@@ -239,7 +239,7 @@ func cleanupDeviceAndSlaves(dev *model.Device) (err error) {
 	}
 
 	//delete all physical paths of the device
-	if (!isFC && dev.IscsiTargets != nil )&& (!isGst || dev.StorageVendor == "3PARdata") {
+	if (!isFC && dev.IscsiTargets != nil && !isGst) {
 		log.Debugf("volume scoped target %+v, initiating iscsi logout and delete", dev.IscsiTargets)
 		err = logoutAndDeleteIscsiTarget(dev)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ func cleanupDeviceAndSlaves(dev *model.Device) (err error) {`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`//delete all physical paths of the device`
`242`		`- if (!isFC && dev.IscsiTargets != nil )&& (!isGst \|\| dev.StorageVendor == "3PARdata") {`
	`242`	`+ if (!isFC && dev.IscsiTargets != nil && !isGst) {`
`243`	`243`	`log.Debugf("volume scoped target %+v, initiating iscsi logout and delete", dev.IscsiTargets)`
`244`	`244`	`err = logoutAndDeleteIscsiTarget(dev)`
`245`	`245`	`if err != nil {`