From 0974db46340d23a2872ec0e2fa9840051f8f2477 Mon Sep 17 00:00:00 2001
From: David Zhu <dyzz@google.com>
Date: Mon, 15 Jul 2019 16:26:07 -0700
Subject: [PATCH] Fix error shadowing error for createPDWithRetry so failures
 return actual error

---
 test/e2e/framework/pv_util.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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