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

Merge pull request #79144 from tedyu/csi-x-recur

Browse Source 
Remove recursion in csiAttacher#waitForVolumeAttachmentInternal
This commit is contained in:
Kubernetes Prow Robot 2019-08-03 00:05:51 -07:00 committed by GitHub
commit 9f6ebf0feb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {
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:

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

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