Merge pull request #220 from clintonskitson/bugfix/sio_preemption

Bugfix for SIO and pre-emption
rexray · Dec 16, 2015 · 96c7a59 · 96c7a59
2 parents a1cf28a + ffbaeb5
commit 96c7a59
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/drivers/storage/scaleio/scaleio.go b/drivers/storage/scaleio/scaleio.go
@@ -554,20 +554,18 @@ func (d *driver) DetachVolume(
 	targetVolume.Volume = volumes[0]
 
 	unmapVolumeSdcParam := &types.UnmapVolumeSdcParam{
-		SdcID:                d.sdc.Sdc.ID,
+		SdcID:                "",
 		IgnoreScsiInitiators: "true",
 		AllSdcs:              "",
 	}
 
 	if force {
 		unmapVolumeSdcParam.AllSdcs = "true"
+	} else {
+		unmapVolumeSdcParam.SdcID = d.sdc.Sdc.ID
 	}
 
-	// need to detect if unmounted first
-	err = targetVolume.UnmapVolumeSdc(unmapVolumeSdcParam)
-	if err != nil {
-		return goof.WithFieldsE(fields, "error unmapping volume sdc", err)
-	}
+	_ = targetVolume.UnmapVolumeSdc(unmapVolumeSdcParam)
 
 	log.WithFields(log.Fields{
 		"provider": providerName,