mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 22:46:12 +00:00
Merge pull request #79144 from tedyu/csi-x-recur
Remove recursion in csiAttacher#waitForVolumeAttachmentInternal
This commit is contained in:
commit
9f6ebf0feb
@ -169,13 +169,9 @@ func (c *csiAttacher) waitForVolumeAttachmentInternal(volumeHandle, attachID str
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("watch error:%v for volume %v", err, volumeHandle)
|
||||
}
|
||||
var watcherClosed bool
|
||||
|
||||
ch := watcher.ResultChan()
|
||||
defer func() {
|
||||
if !watcherClosed {
|
||||
watcher.Stop()
|
||||
}
|
||||
}()
|
||||
defer watcher.Stop()
|
||||
|
||||
for {
|
||||
select {
|
||||
@ -201,11 +197,7 @@ func (c *csiAttacher) waitForVolumeAttachmentInternal(volumeHandle, attachID str
|
||||
return "", errors.New("volume attachment has been deleted")
|
||||
|
||||
case watch.Error:
|
||||
// close the watcher to avoid keeping the watcher too log
|
||||
watcher.Stop()
|
||||
watcherClosed = true
|
||||
// start another cycle
|
||||
return c.waitForVolumeAttachmentInternal(volumeHandle, attachID, timer, timeout)
|
||||
klog.Warningf("waitForVolumeAttachmentInternal received watch error: %v", event)
|
||||
}
|
||||
|
||||
case <-timer.C:
|
||||
|
@ -221,6 +221,8 @@ func TestAttacherAttach(t *testing.T) {
|
||||
status.AttachError = &storage.VolumeError{
|
||||
Message: "attacher error",
|
||||
}
|
||||
errStatus := apierrs.NewInternalError(fmt.Errorf("we got an error")).Status()
|
||||
fakeWatcher.Error(&errStatus)
|
||||
} else {
|
||||
status.Attached = true
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user