mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #101862 from jsafrane/fix-fc-detach-retry
Retry detaching FibreChannel volume few times
This commit is contained in:
commit
81e159f0b0
@ -23,13 +23,13 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"k8s.io/klog/v2"
|
|
||||||
"k8s.io/mount-utils"
|
|
||||||
|
|
||||||
v1 "k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/apimachinery/pkg/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
|
"k8s.io/klog/v2"
|
||||||
"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/mount-utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type fcAttacher struct {
|
type fcAttacher struct {
|
||||||
@ -172,12 +172,28 @@ func (detacher *fcDetacher) UnmountDevice(deviceMountPath string) error {
|
|||||||
if devName == "" {
|
if devName == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
unMounter := volumeSpecToUnmounter(detacher.mounter, detacher.host)
|
unMounter := volumeSpecToUnmounter(detacher.mounter, detacher.host)
|
||||||
err = detacher.manager.DetachDisk(*unMounter, devName)
|
// The device is unmounted now. If UnmountDevice was retried, GetDeviceNameFromMount
|
||||||
|
// won't find any mount and won't return DetachDisk below.
|
||||||
|
// Therefore implement our own retry mechanism here.
|
||||||
|
// E.g. DetachDisk sometimes fails to flush a multipath device with "device is busy" when it was
|
||||||
|
// just unmounted.
|
||||||
|
// 2 minutes should be enough within 6 minute force detach timeout.
|
||||||
|
var detachError error
|
||||||
|
err = wait.PollImmediate(10*time.Second, 2*time.Minute, func() (bool, error) {
|
||||||
|
detachError = detacher.manager.DetachDisk(*unMounter, devName)
|
||||||
|
if detachError != nil {
|
||||||
|
klog.V(4).Infof("fc: failed to detach disk %s (%s): %v", devName, deviceMountPath, detachError)
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("fc: failed to detach disk: %s\nError: %v", devName, err)
|
return fmt.Errorf("fc: failed to detach disk: %s: %v", devName, detachError)
|
||||||
}
|
}
|
||||||
klog.V(4).Infof("fc: successfully detached disk: %s", devName)
|
|
||||||
|
klog.V(2).Infof("fc: successfully detached disk: %s", devName)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user