Skip to content

Commit c740343

Browse files
committed
ajust wait interval
Signed-off-by: roc <[email protected]>
1 parent 418b4c3 commit c740343

File tree

6 files changed

+18
-13
lines changed

6 files changed

+18
-13
lines changed

pkg/clb/batch-listener.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func doBatchCreateListener(apiName, region, lbId, protocol, certId, extensivePar
8484
return
8585
}
8686
listenerIds = util.ConvertPtrSlice(res.Response.ListenerIds)
87-
_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName)
87+
_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName, DefaultWaitInterval)
8888
if err != nil {
8989
err = errors.WithStack(err)
9090
}
@@ -244,7 +244,7 @@ func startDeleteListenerProccessor(concurrent int) {
244244
}
245245
return
246246
}
247-
_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName)
247+
_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName, DefaultWaitInterval)
248248
if err != nil {
249249
for _, task := range tasks {
250250
task.Result <- err

pkg/clb/batch-target.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func startRegisterTargetsProccessor(concurrent int) {
5555
task.Result <- err
5656
}
5757
} else {
58-
_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName)
58+
_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName, DefaultWaitInterval)
5959
for _, task := range tasks {
6060
task.Result <- err
6161
}
@@ -172,7 +172,7 @@ func startDeregisterTargetsProccessor(concurrent int) {
172172
return
173173
}
174174
// 解绑失败
175-
_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName)
175+
_, err = Wait(context.Background(), region, *res.Response.RequestId, apiName, DefaultWaitInterval)
176176
if err != nil {
177177
for _, task := range tasks {
178178
task.Result <- err

pkg/clb/instance.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func Create(ctx context.Context, region, vpcId, extensiveParameters string, num
8787
}
8888
ids = util.ConvertPtrSlice(resp.Response.LoadBalancerIds)
8989
if len(ids) == 0 {
90-
ids, err = Wait(ctx, region, *resp.Response.RequestId, "CreateLoadBalancer")
90+
ids, err = Wait(ctx, region, *resp.Response.RequestId, "CreateLoadBalancer", LongWaitInterval)
9191
if err != nil {
9292
return nil, err
9393
}
@@ -137,7 +137,7 @@ func Delete(ctx context.Context, region string, lbIds ...string) error {
137137
}
138138
return err
139139
}
140-
_, err = Wait(ctx, region, *resp.Response.RequestId, "DeleteLoadBalancer")
140+
_, err = Wait(ctx, region, *resp.Response.RequestId, "DeleteLoadBalancer", LongWaitInterval)
141141
return err
142142
}
143143

@@ -157,7 +157,7 @@ func CreateCLB(ctx context.Context, region string, req *clb.CreateLoadBalancerRe
157157
return
158158
}
159159
lbId = *ids[0]
160-
if _, err = Wait(ctx, region, *resp.Response.RequestId, "CreateLoadBalancer"); err != nil {
160+
if _, err = Wait(ctx, region, *resp.Response.RequestId, "CreateLoadBalancer", LongWaitInterval); err != nil {
161161
return
162162
}
163163
return

pkg/clb/listener.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func CreateListener(ctx context.Context, region, lbId string, port, endPort int6
166166
err = fmt.Errorf("found %d listeners created", len(resp.Response.ListenerIds))
167167
return
168168
}
169-
_, err = Wait(ctx, region, *resp.Response.RequestId, "CreateListener")
169+
_, err = Wait(ctx, region, *resp.Response.RequestId, "CreateListener", DefaultWaitInterval)
170170
if err != nil {
171171
err = errors.WithStack(err)
172172
return
@@ -237,7 +237,7 @@ func DeleteListener(ctx context.Context, region, lbId, listenerId string) error
237237
if err != nil {
238238
return errors.WithStack(err)
239239
}
240-
_, err = Wait(ctx, region, *resp.Response.RequestId, "DeleteListener")
240+
_, err = Wait(ctx, region, *resp.Response.RequestId, "DeleteListener", DefaultWaitInterval)
241241
if err != nil {
242242
return errors.WithStack(err)
243243
}

pkg/clb/target.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func DeregisterTargetsForListener(ctx context.Context, region, lbId, listenerId
180180
if err != nil {
181181
return err
182182
}
183-
_, err = Wait(ctx, region, *resp.Response.RequestId, "DeregisterTargets")
183+
_, err = Wait(ctx, region, *resp.Response.RequestId, "DeregisterTargets", DefaultWaitInterval)
184184
return err
185185
}
186186

@@ -210,7 +210,7 @@ func RegisterTargets(ctx context.Context, region, lbId, listenerId string, targe
210210
if err != nil {
211211
return err
212212
}
213-
_, err = Wait(ctx, region, *resp.Response.RequestId, "RegisterTargets")
213+
_, err = Wait(ctx, region, *resp.Response.RequestId, "RegisterTargets", DefaultWaitInterval)
214214
return err
215215
}
216216

pkg/clb/wait.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ import (
1111
"sigs.k8s.io/controller-runtime/pkg/log"
1212
)
1313

14-
func Wait(ctx context.Context, region, reqId, taskName string) (ids []string, err error) {
14+
const (
15+
DefaultWaitInterval = 100 * time.Millisecond
16+
LongWaitInterval = 1 * time.Second
17+
)
18+
19+
func Wait(ctx context.Context, region, reqId, taskName string, interval time.Duration) (ids []string, err error) {
1520
for range 100 {
1621
select {
1722
case <-ctx.Done():
@@ -29,7 +34,7 @@ func Wait(ctx context.Context, region, reqId, taskName string) (ids []string, er
2934
}
3035
switch *res.Response.Status {
3136
case 2: // 任务进行中,继续等待
32-
time.Sleep(1 * time.Second)
37+
time.Sleep(interval)
3338
log.FromContext(ctx).V(5).Info("task still waiting", "reqId", reqId, "taskName", taskName)
3439
continue
3540
case 1: // 任务失败,返回错误

0 commit comments

Comments
 (0)