Merge pull request #39075 from ChenLingPeng/github-waitfor

Automatic merge from submit-queue no need to sleep for last retry break for needless sleep

Merge pull request #39075 from ChenLingPeng/github-waitfor
85bf2567 · Kubernetes Submit Queue · GitHub · 2d154999 · 1d9f7545 · 85bf2567
Commit 85bf2567 authored Jan 03, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

iscsi_util.go pkg/volume/iscsi/iscsi_util.go +3 -0

rbd_util.go pkg/volume/rbd/rbd_util.go +3 -0

No files found.
--- a/pkg/volume/iscsi/iscsi_util.go
+++ b/pkg/volume/iscsi/iscsi_util.go
@@ -58,6 +58,9 @@ func waitForPathToExistInternal(devicePath string, maxRetries int, deviceTranspo
 		if err != nil && !os.IsNotExist(err) {
 			return false
 		}
+		if i == maxRetries-1 {
+			break
+		}
 		time.Sleep(time.Second)
 	}
 	return false

--- a/pkg/volume/rbd/rbd_util.go
+++ b/pkg/volume/rbd/rbd_util.go
@@ -84,6 +84,9 @@ func waitForPath(pool, image string, maxRetries int) (string, bool) {
 		if found {
 			return devicePath, true
 		}
+		if i == maxRetries-1 {
+			break
+		}
 		time.Sleep(time.Second)
 	}
 	return "", false