github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Remove recursion in csiAttacher#waitForVolumeAttachmentInternal

Browse Source
This commit is contained in:
Ted Yu 2019-07-23 14:29:22 -07:00 committed by Ted Yu
parent 5b496fe8f5
commit f4fbfcb46a
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/volume/csi/csi_attacher.go
View File

@ -169,13 +169,9 @@ func (c *csiAttacher) waitForVolumeAttachmentInternal(volumeHandle, attachID str
if err != nil { if err != nil {
return "", fmt.Errorf("watch error:%v for volume %v", err, volumeHandle) return "", fmt.Errorf("watch error:%v for volume %v", err, volumeHandle)
} }
var watcherClosed bool
ch := watcher.ResultChan() ch := watcher.ResultChan()
defer func() { defer watcher.Stop()
if !watcherClosed {
watcher.Stop()
}
}()
for { for {
select { select {
@ -201,11 +197,7 @@ func (c *csiAttacher) waitForVolumeAttachmentInternal(volumeHandle, attachID str
return "", errors.New("volume attachment has been deleted") return "", errors.New("volume attachment has been deleted")
case watch.Error: case watch.Error:
// close the watcher to avoid keeping the watcher too log klog.Warningf("waitForVolumeAttachmentInternal received watch error: %v", event)
watcher.Stop()
watcherClosed = true
// start another cycle
return c.waitForVolumeAttachmentInternal(volumeHandle, attachID, timer, timeout)
} }
case <-timer.C: case <-timer.C:

2
pkg/volume/csi/csi_attacher_test.go
View File

@ -221,6 +221,8 @@ func TestAttacherAttach(t *testing.T) {
status.AttachError = &storage.VolumeError{ status.AttachError = &storage.VolumeError{
Message: "attacher error", Message: "attacher error",
} }
errStatus := apierrs.NewInternalError(fmt.Errorf("we got an error")).Status()
fakeWatcher.Error(&errStatus)
} else { } else {
status.Attached = true status.Attached = true
} }