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

Merge pull request #80188 from davidz627/fix/migrateTest

Browse Source 
Fix error shadowing error for createPDWithRetry so failures return actual error
This commit is contained in:
Kubernetes Prow Robot 2019-07-15 20:28:13 -07:00 committed by GitHub
commit d900746422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/framework/pv_util.go
View File

@ -647,8 +647,9 @@ func MakePersistentVolumeClaim(cfg PersistentVolumeClaimConfig, ns string) *v1.P
func createPDWithRetry(zone string) (string, error) { func createPDWithRetry(zone string) (string, error) {
var err error var err error
var newDiskName string
for start := time.Now(); time.Since(start) < pdRetryTimeout; time.Sleep(pdRetryPollTime) { for start := time.Now(); time.Since(start) < pdRetryTimeout; time.Sleep(pdRetryPollTime) {
newDiskName, err := createPD(zone) newDiskName, err = createPD(zone)
if err != nil { if err != nil {
e2elog.Logf("Couldn't create a new PD, sleeping 5 seconds: %v", err) e2elog.Logf("Couldn't create a new PD, sleeping 5 seconds: %v", err)
continue continue