github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Unmount iSCSI device only if it's mounted.

Browse Source
This commit is contained in:
Jan Safranek
2018-09-27 10:24:59 +02:00
parent ffaff4e976
commit e5fbb3538f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/volume/iscsi/iscsi_util.go
View File

@@ -23,6 +23,7 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strconv"
"strings" "strings"
"time" "time"
@@ -34,7 +35,6 @@ import (
"k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume"
volumeutil "k8s.io/kubernetes/pkg/volume/util" volumeutil "k8s.io/kubernetes/pkg/volume/util"
"k8s.io/kubernetes/pkg/volume/util/volumepathhandler" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler"
"strconv"
) )
var ( var (
@@ -553,10 +553,18 @@ func (util *ISCSIUtil) DetachDisk(c iscsiDiskUnmounter, mntPath string) error {
glog.Warningf("Warning: Unmount skipped because path does not exist: %v", mntPath) glog.Warningf("Warning: Unmount skipped because path does not exist: %v", mntPath)
return nil return nil
} }
if err := c.mounter.Unmount(mntPath); err != nil {
glog.Errorf("iscsi detach disk: failed to unmount: %s\nError: %v", mntPath, err) notMnt, err := c.mounter.IsLikelyNotMountPoint(mntPath)
if err != nil {
return err return err
} }
if !notMnt {
if err := c.mounter.Unmount(mntPath); err != nil {
glog.Errorf("iscsi detach disk: failed to unmount: %s\nError: %v", mntPath, err)
return err
}
}
// if device is no longer used, see if need to logout the target // if device is no longer used, see if need to logout the target
device, prefix, err := extractDeviceAndPrefix(mntPath) device, prefix, err := extractDeviceAndPrefix(mntPath)
if err != nil { if err != nil {