mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-20 17:38:50 +00:00
Merge pull request #35629 from hpcloud/bug/33128-unused-waitfordetach
Automatic merge from submit-queue Remove unused WaitForDetach from Detacher interface and plugins See issue #33128 and PR #33270 We can't rely on the device name provided by OpenStack Cinder, and thus must perform detection based on the drive serial number (aka It's cinder ID) on the kubelet itself. This needs to be removed now, as part of #33128, as the code can't be updated to attempt device detection and fallback through to the Cinder provided deviceName, as detection "fails" when the device is gone, and if cinder has reported a deviceName that another volume has used in relaity, then this will block forever (or until the other, unreleated, volume has been detached)
This commit is contained in:
@@ -189,11 +189,6 @@ type Detacher interface {
|
||||
// Detach the given device from the node with the given Name.
|
||||
Detach(deviceName string, nodeName types.NodeName) error
|
||||
|
||||
// WaitForDetach blocks until the device is detached from this
|
||||
// node. If the device does not detach within the given timeout
|
||||
// period an error is returned.
|
||||
WaitForDetach(devicePath string, timeout time.Duration) error
|
||||
|
||||
// UnmountDevice unmounts the global mount of the disk. This
|
||||
// should only be called once all bind mounts have been
|
||||
// unmounted.
|
||||
|
Reference in New Issue
Block a user