github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Retry detaching FibreChannel volume few times

Browse Source 
When UnmountDevice() of a FibreChannel volume fails after unmounting the
device and before the device is fully cleaned up, subsequent
UnmountDevice() retry won't find the device mounted and return without
retrying the device cleanup.

Therefore implement its own retry inside UnmountDevice() to make sure that
the volume devices are either fully cleaned or the error is serius enough
that even 1 minute of trying does not help.
This commit is contained in:
Jan Safranek 2021-05-10 10:49:31 +02:00
parent 3726309bf9
commit 64e8396e30
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/volume/fc/attacher.go
View File

@ -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
} }