Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set shorten waiter max delay. #675

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Set shorten waiter max delay. #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cde52e5
Set shorten MaxDelay to WaiterOptions.
fujiwara Mar 13, 2024
a236477
call showServiceStatus at last once more.
fujiwara Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ecspresso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const dryRunStr = "DRY RUN"

var Version string
var delayForServiceChanged = 3 * time.Second
var waiterMaxDelay = 15 * time.Second
var spcIndent = " "

type TaskDefinition = types.TaskDefinition
Expand Down
8 changes: 6 additions & 2 deletions run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,9 @@ func (d *App) waitTask(ctx context.Context, task *types.Task, untilRunning bool)
id := arnToName(*task.TaskArn)
if untilRunning {
d.Log("Waiting for task ID %s until running", id)
waiter := ecs.NewTasksRunningWaiter(d.ecs)
waiter := ecs.NewTasksRunningWaiter(d.ecs, func(o *ecs.TasksRunningWaiterOptions) {
o.MaxDelay = waiterMaxDelay
})
if err := waiter.Wait(ctx, d.DescribeTasksInput(task), d.Timeout()); err != nil {
return err
}
Expand All @@ -223,7 +225,9 @@ func (d *App) waitTask(ctx context.Context, task *types.Task, untilRunning bool)
}

d.Log("Waiting for task ID %s until stopped", id)
waiter := ecs.NewTasksStoppedWaiter(d.ecs)
waiter := ecs.NewTasksStoppedWaiter(d.ecs, func(o *ecs.TasksStoppedWaiterOptions) {
o.MaxDelay = waiterMaxDelay
})
if err := waiter.Wait(ctx, d.DescribeTasksInput(task), d.Timeout()); err != nil {
return fmt.Errorf("failed to wait task: %w", err)
}
Expand Down
17 changes: 14 additions & 3 deletions wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ func (d *App) WaitServiceStable(ctx context.Context, sv *Service) error {
defer cancel()

tick := time.NewTicker(10 * time.Second)
st := &showState{lastEventAt: time.Now()}
go func() {
st := &showState{lastEventAt: time.Now()}
for {
select {
case <-waitCtx.Done():
Expand All @@ -88,10 +88,19 @@ func (d *App) WaitServiceStable(ctx context.Context, sv *Service) error {
}
}()

waiter := ecs.NewServicesStableWaiter(d.ecs)
waiter := ecs.NewServicesStableWaiter(d.ecs, func(o *ecs.ServicesStableWaiterOptions) {
o.MaxDelay = waiterMaxDelay
})
if err := waiter.Wait(ctx, d.DescribeServicesInput(), d.Timeout()); err != nil {
return fmt.Errorf("failed to wait for service stable: %w", err)
}
cancel() // stop the showServiceStatus

<-time.After(delayForServiceChanged)
// show the service status once more (correct all logs)
if err := d.showServiceStatus(ctx, st); err != nil {
d.Log("[WARNING] %s", err.Error())
}
return nil
}

Expand Down Expand Up @@ -125,7 +134,9 @@ func (d *App) WaitForCodeDeploy(ctx context.Context, sv *Service) error {
d.Log("Waiting for a deployment successful ID: " + dpID)
go d.codeDeployProgressBar(ctx, dpID)

waiter := codedeploy.NewDeploymentSuccessfulWaiter(d.codedeploy)
waiter := codedeploy.NewDeploymentSuccessfulWaiter(d.codedeploy, func(o *codedeploy.DeploymentSuccessfulWaiterOptions) {
o.MaxDelay = waiterMaxDelay
})
return waiter.Wait(
ctx,
&codedeploy.GetDeploymentInput{DeploymentId: &dpID},
Expand Down
Loading