Commit eb35cee9 authored by jolestar's avatar jolestar

Remove unused command waitfordetach from flex volume driver

parent 637cd7d0
...@@ -19,7 +19,6 @@ package flexvolume ...@@ -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) ...@@ -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 {
......
...@@ -39,7 +39,6 @@ const ( ...@@ -39,7 +39,6 @@ const (
mountDeviceCmd = "mountdevice" mountDeviceCmd = "mountdevice"
detachCmd = "detach" detachCmd = "detach"
waitForDetachCmd = "waitfordetach"
unmountDeviceCmd = "unmountdevice" unmountDeviceCmd = "unmountdevice"
mountCmd = "mount" mountCmd = "mount"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment