github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused command waitfordetach from flex volume driver

Browse Source
This commit is contained in:
jolestar 2017-08-16 16:40:32 +08:00
parent 637cd7d02a
commit eb35cee9f8
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/volume/flexvolume/detacher.go
View File

@ -19,7 +19,6 @@ package flexvolume
import ( import (
"fmt" "fmt"
"os" "os"
"time"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
@ -47,18 +46,6 @@ func (d *flexVolumeDetacher) Detach(volumeName string, hostName types.NodeName)
return err return err
} }
// WaitForDetach is part of the volume.Detacher interface.
func (d *flexVolumeDetacher) WaitForDetach(devicePath string, timeout time.Duration) error {
call := d.plugin.NewDriverCallWithTimeout(waitForDetachCmd, timeout)
call.Append(devicePath)
_, err := call.Run()
if isCmdNotSupportedErr(err) {
return (*detacherDefaults)(d).WaitForDetach(devicePath, timeout)
}
return err
}
// UnmountDevice is part of the volume.Detacher interface. // UnmountDevice is part of the volume.Detacher interface.
func (d *flexVolumeDetacher) UnmountDevice(deviceMountPath string) error { func (d *flexVolumeDetacher) UnmountDevice(deviceMountPath string) error {

1
pkg/volume/flexvolume/driver-call.go
View File

@ -39,7 +39,6 @@ const (
mountDeviceCmd = "mountdevice" mountDeviceCmd = "mountdevice"
detachCmd = "detach" detachCmd = "detach"
waitForDetachCmd = "waitfordetach"
unmountDeviceCmd = "unmountdevice" unmountDeviceCmd = "unmountdevice"
mountCmd = "mount" mountCmd = "mount"