github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed panic in iSCSI.UnmountDevice 

Fill iscsiDetacher.plugin so iscsiDetacher.plugin.targetLocks.LockKey(iqn) does not
panic.
pull/58/head
Jan Safranek 2018-09-27 10:23:54 +02:00
parent 3fe21e5433
commit ffaff4e976
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/volume/iscsi/attacher.go
View File

@ -137,6 +137,7 @@ type iscsiDetacher struct {
host volume.VolumeHost host volume.VolumeHost
mounter mount.Interface mounter mount.Interface
manager diskManager manager diskManager
plugin *iscsiPlugin
} }
var _ volume.Detacher = &iscsiDetacher{} var _ volume.Detacher = &iscsiDetacher{}
@ -148,6 +149,7 @@ func (plugin *iscsiPlugin) NewDetacher() (volume.Detacher, error) {
host: plugin.host, host: plugin.host,
mounter: plugin.host.GetMounter(iscsiPluginName), mounter: plugin.host.GetMounter(iscsiPluginName),
manager: &ISCSIUtil{}, manager: &ISCSIUtil{},
plugin: plugin,
}, nil }, nil
} }
@ -160,7 +162,7 @@ func (detacher *iscsiDetacher) Detach(volumeName string, nodeName types.NodeName
} }
func (detacher *iscsiDetacher) UnmountDevice(deviceMountPath string) error { func (detacher *iscsiDetacher) UnmountDevice(deviceMountPath string) error {
unMounter := volumeSpecToUnmounter(detacher.mounter, detacher.host) unMounter := volumeSpecToUnmounter(detacher.mounter, detacher.host, detacher.plugin)
err := detacher.manager.DetachDisk(*unMounter, deviceMountPath) err := detacher.manager.DetachDisk(*unMounter, deviceMountPath)
if err != nil { if err != nil {
return fmt.Errorf("iscsi: failed to detach disk: %s\nError: %v", deviceMountPath, err) return fmt.Errorf("iscsi: failed to detach disk: %s\nError: %v", deviceMountPath, err)
@ -225,11 +227,11 @@ func volumeSpecToMounter(spec *volume.Spec, host volume.VolumeHost, targetLocks
}, nil }, nil
} }
func volumeSpecToUnmounter(mounter mount.Interface, host volume.VolumeHost) *iscsiDiskUnmounter { func volumeSpecToUnmounter(mounter mount.Interface, host volume.VolumeHost, plugin *iscsiPlugin) *iscsiDiskUnmounter {
exec := host.GetExec(iscsiPluginName) exec := host.GetExec(iscsiPluginName)
return &iscsiDiskUnmounter{ return &iscsiDiskUnmounter{
iscsiDisk: &iscsiDisk{ iscsiDisk: &iscsiDisk{
plugin: &iscsiPlugin{}, plugin: plugin,
}, },
mounter: mounter, mounter: mounter,
exec: exec, exec: exec,