github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93052 from andyzhangx/fix-initial-delay

Browse Source 
fix: initial delay in mounting azure disk & file
This commit is contained in:
Kubernetes Prow Robot 2020-07-16 17:27:00 -07:00 committed by GitHub
commit 58893f3443
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/azure_dd/attacher.go
View File

@ -163,7 +163,7 @@ func (a *azureDiskAttacher) WaitForAttach(spec *volume.Spec, devicePath string,
newDevicePath := ""
err = wait.Poll(1*time.Second, timeout, func() (bool, error) {
err = wait.PollImmediate(1*time.Second, timeout, func() (bool, error) {
if newDevicePath, err = findDiskByLun(int(lun), io, exec); err != nil {
return false, fmt.Errorf("azureDisk - WaitForAttach ticker failed node (%s) disk (%s) lun(%v) err(%s)", nodeName, diskName, lun, err)
}

2
pkg/volume/azure_file/azure_file.go
View File

@ -303,7 +303,7 @@ func (b *azureFileMounter) SetUpAt(dir string, mounterArgs volume.MounterArgs) e
}
mountComplete := false
err = wait.Poll(5*time.Second, 10*time.Minute, func() (bool, error) {
err = wait.PollImmediate(1*time.Second, 2*time.Minute, func() (bool, error) {
err := b.mounter.MountSensitive(source, dir, "cifs", mountOptions, sensitiveMountOptions)
mountComplete = true
return true, err