ajust wait interval

Signed-off-by: roc <[email protected]>

Author: imroc

pkg/clb/batch-listener.go

@@ -84,7 +84,7 @@ func doBatchCreateListener(apiName, region, lbId, protocol, certId, extensivePar
 		return
 	}
 	listenerIds = util.ConvertPtrSlice(res.Response.ListenerIds)
-	_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName)
+	_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName, DefaultWaitInterval)
 	if err != nil {
 		err = errors.WithStack(err)
 	}
@@ -244,7 +244,7 @@ func startDeleteListenerProccessor(concurrent int) {
 			}
 			return
 		}
-		_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName)
+		_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName, DefaultWaitInterval)
 		if err != nil {
 			for _, task := range tasks {
 				task.Result <- err

pkg/clb/batch-target.go

@@ -55,7 +55,7 @@ func startRegisterTargetsProccessor(concurrent int) {
 				task.Result <- err
 			}
 		} else {
-			_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName)
+			_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName, DefaultWaitInterval)
 			for _, task := range tasks {
 				task.Result <- err
 			}
@@ -172,7 +172,7 @@ func startDeregisterTargetsProccessor(concurrent int) {
 			return
 		}
 		// 解绑失败
-		_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName)
+		_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName, DefaultWaitInterval)
 		if err != nil {
 			for _, task := range tasks {
 				task.Result <- err

pkg/clb/instance.go

@@ -87,7 +87,7 @@ func Create(ctx context.Context, region, vpcId, extensiveParameters string, num
 	}
 	ids = util.ConvertPtrSlice(resp.Response.LoadBalancerIds)
 	if len(ids) == 0 {
-		ids, err = Wait(ctx, region, *resp.Response.RequestId, "CreateLoadBalancer")
+		ids, err = Wait(ctx, region, *resp.Response.RequestId, "CreateLoadBalancer", LongWaitInterval)
 		if err != nil {
 			return nil, err
 		}
@@ -137,7 +137,7 @@ func Delete(ctx context.Context, region string, lbIds ...string) error {
 		}
 		return err
 	}
-	_, err = Wait(ctx, region, *resp.Response.RequestId, "DeleteLoadBalancer")
+	_, err = Wait(ctx, region, *resp.Response.RequestId, "DeleteLoadBalancer", LongWaitInterval)
 	return err
 }
 
@@ -157,7 +157,7 @@ func CreateCLB(ctx context.Context, region string, req *clb.CreateLoadBalancerRe
 		return
 	}
 	lbId = *ids[0]
-	if _, err = Wait(ctx, region, *resp.Response.RequestId, "CreateLoadBalancer"); err != nil {
+	if _, err = Wait(ctx, region, *resp.Response.RequestId, "CreateLoadBalancer", LongWaitInterval); err != nil {
 		return
 	}
 	return

pkg/clb/listener.go

@@ -166,7 +166,7 @@ func CreateListener(ctx context.Context, region, lbId string, port, endPort int6
 		err = fmt.Errorf("found %d listeners created", len(resp.Response.ListenerIds))
 		return
 	}
-	_, err = Wait(ctx, region, *resp.Response.RequestId, "CreateListener")
+	_, err = Wait(ctx, region, *resp.Response.RequestId, "CreateListener", DefaultWaitInterval)
 	if err != nil {
 		err = errors.WithStack(err)
 		return
@@ -237,7 +237,7 @@ func DeleteListener(ctx context.Context, region, lbId, listenerId string) error
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	_, err = Wait(ctx, region, *resp.Response.RequestId, "DeleteListener")
+	_, err = Wait(ctx, region, *resp.Response.RequestId, "DeleteListener", DefaultWaitInterval)
 	if err != nil {
 		return errors.WithStack(err)
 	}

pkg/clb/target.go

@@ -180,7 +180,7 @@ func DeregisterTargetsForListener(ctx context.Context, region, lbId, listenerId
 	if err != nil {
 		return err
 	}
-	_, err = Wait(ctx, region, *resp.Response.RequestId, "DeregisterTargets")
+	_, err = Wait(ctx, region, *resp.Response.RequestId, "DeregisterTargets", DefaultWaitInterval)
 	return err
 }
 
@@ -210,7 +210,7 @@ func RegisterTargets(ctx context.Context, region, lbId, listenerId string, targe
 	if err != nil {
 		return err
 	}
-	_, err = Wait(ctx, region, *resp.Response.RequestId, "RegisterTargets")
+	_, err = Wait(ctx, region, *resp.Response.RequestId, "RegisterTargets", DefaultWaitInterval)
 	return err
 }
 

pkg/clb/wait.go

@@ -11,7 +11,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
-func Wait(ctx context.Context, region, reqId, taskName string) (ids []string, err error) {
+const (
+	DefaultWaitInterval = 100 * time.Millisecond
+	LongWaitInterval    = 1 * time.Second
+)
+
+func Wait(ctx context.Context, region, reqId, taskName string, interval time.Duration) (ids []string, err error) {
 	for range 100 {
 		select {
 		case <-ctx.Done():
@@ -29,7 +34,7 @@ func Wait(ctx context.Context, region, reqId, taskName string) (ids []string, er
 			}
 			switch *res.Response.Status {
 			case 2: // 任务进行中，继续等待
-				time.Sleep(1 * time.Second)
+				time.Sleep(interval)
 				log.FromContext(ctx).V(5).Info("task still waiting", "reqId", reqId, "taskName", taskName)
 				continue
 			case 1: // 任务失败，返回错误