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

Jump to bottom

feat: timeout for deploy command #3349

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −8
Open

feat: timeout for deploy command #3349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 20 additions & 7 deletions frontend/cli/cmd_deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package main

import (
"context"
"fmt"
"time"

"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1beta1/provisioner/provisionerconnect"
Expand All @@ -11,10 +13,11 @@ import (
)

type deployCmd struct {
Replicas int32 `short:"n" help:"Number of replicas to deploy." default:"1"`
NoWait bool `help:"Do not wait for deployment to complete." default:"false"`
UseProvisioner bool `help:"Use the ftl-provisioner to deploy the application." default:"false" hidden:"true"`
Build buildCmd `embed:""`
Replicas int32 `short:"n" help:"Number of replicas to deploy." default:"1"`
NoWait bool `help:"Do not wait for deployment to complete." default:"false"`
UseProvisioner bool `help:"Use the ftl-provisioner to deploy the application." default:"false" hidden:"true"`
Build buildCmd `embed:""`
Timeout time.Duration `short:"t" help:"Timeout for the deployment."`
}

func (d *deployCmd) Run(ctx context.Context, projConfig projectconfig.Config) error {
Expand All @@ -24,18 +27,28 @@ func (d *deployCmd) Run(ctx context.Context, projConfig projectconfig.Config) er
} else {
client = rpc.ClientFromContext[ftlv1connect.ControllerServiceClient](ctx)
}

bindAllocator, err := bindAllocatorWithoutController()
if err != nil {
return err
}

// Cancel build engine context to ensure all language plugins are killed.
ctx, cancel := context.WithCancel(ctx)
var cancel context.CancelFunc
if d.Timeout > 0 {
ctx, cancel = context.WithTimeout(ctx, d.Timeout)
defer cancel()
} else {
ctx, cancel = context.WithCancel(ctx)
}
defer cancel()
engine, err := buildengine.New(ctx, client, projConfig, d.Build.Dirs, bindAllocator, buildengine.BuildEnv(d.Build.BuildEnv), buildengine.Parallelism(d.Build.Parallelism))
if err != nil {
return err
}
return engine.BuildAndDeploy(ctx, d.Replicas, !d.NoWait)

err = engine.BuildAndDeploy(ctx, d.Replicas, !d.NoWait)
if err != nil {
return fmt.Errorf("failed to deploy: %w", err)
}
return nil
}
2 changes: 1 addition & 1 deletion internal/integration/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func ExpectError(action Action, expectedErrorMsg ...string) Action {
func Deploy(module string) Action {
return Chain(
func(t testing.TB, ic TestContext) {
args := []string{"deploy"}
args := []string{"deploy", "-t", "4m"}
if ic.Provisioner != nil {
args = append(args, "--use-provisioner", "--provisioner-endpoint=http://localhost:8893")
}
Expand Down
Loading