Skip to content

K
k3s
Commit d7a86686 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #27399 from jingxu97/pdtimeout

Automatic merge from submit-queue Increase timeout for testing PD create/delete. fix #26795 for releasev1.1
parents 3a29aa79 d8eedd54
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
test/e2e/pd.go
View file @ d7a86686
......@@ -46,6 +46,8 @@ const (
gcePDDetachPollTime = 10 * time.Second
nodeStatusTimeout = 1 * time.Minute
nodeStatusPollTime = 1 * time.Second
gcePDRetryTimeout = 5 * time.Minute
gcePDRetryPollTime = 5 * time.Second
)
var _ = framework.KubeDescribe("Pod Disks", func() {
......@@ -288,7 +290,7 @@ var _ = framework.KubeDescribe("Pod Disks", func() {
func createPDWithRetry() (string, error) {
newDiskName := ""
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 {
framework.Logf("Couldn't create a new PD. Sleeping 5 seconds (%v)", err)
continue
......@@ -301,7 +303,7 @@ func createPDWithRetry() (string, error) {
func deletePDWithRetry(diskName string) {
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 {
framework.Logf("Couldn't delete PD %q. Sleeping 5 seconds (%v)", diskName, err)
continue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment