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

Merge pull request #27399 from jingxu97/pdtimeout

Browse Source 
Automatic merge from submit-queue

Increase timeout for testing PD create/delete.


fix #26795 for releasev1.1
This commit is contained in:
k8s-merge-robot 2016-06-23 09:27:25 -07:00 committed by GitHub
commit d7a8668606
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/pd.go
View File

@ -46,6 +46,8 @@ const (
gcePDDetachPollTime = 10 * time.Second gcePDDetachPollTime = 10 * time.Second
nodeStatusTimeout = 1 * time.Minute nodeStatusTimeout = 1 * time.Minute
nodeStatusPollTime = 1 * time.Second nodeStatusPollTime = 1 * time.Second
gcePDRetryTimeout = 5 * time.Minute
gcePDRetryPollTime = 5 * time.Second
) )
var _ = framework.KubeDescribe("Pod Disks", func() { var _ = framework.KubeDescribe("Pod Disks", func() {
@ -288,7 +290,7 @@ var _ = framework.KubeDescribe("Pod Disks", func() {
func createPDWithRetry() (string, error) { func createPDWithRetry() (string, error) {
newDiskName := "" newDiskName := ""
var err error var err error
for start := time.Now(); time.Since(start) < 180*time.Second; time.Sleep(5 * time.Second) { for start := time.Now(); time.Since(start) < gcePDRetryTimeout; time.Sleep(gcePDRetryPollTime) {
if newDiskName, err = createPD(); err != nil { if newDiskName, err = createPD(); err != nil {
framework.Logf("Couldn't create a new PD. Sleeping 5 seconds (%v)", err) framework.Logf("Couldn't create a new PD. Sleeping 5 seconds (%v)", err)
continue continue
@ -301,7 +303,7 @@ func createPDWithRetry() (string, error) {
func deletePDWithRetry(diskName string) { func deletePDWithRetry(diskName string) {
var err error var err error
for start := time.Now(); time.Since(start) < 180*time.Second; time.Sleep(5 * time.Second) { for start := time.Now(); time.Since(start) < gcePDRetryTimeout; time.Sleep(gcePDRetryPollTime) {
if err = deletePD(diskName); err != nil { if err = deletePD(diskName); err != nil {
framework.Logf("Couldn't delete PD %q. Sleeping 5 seconds (%v)", diskName, err) framework.Logf("Couldn't delete PD %q. Sleeping 5 seconds (%v)", diskName, err)
continue continue