From 0032ab7f004df1c1df5e07406ad7acb1c124d946 Mon Sep 17 00:00:00 2001 From: "denis.bilenko" Date: Wed, 18 Nov 2026 18:00:22 +0000 Subject: [PATCH 1/2] Deploy the app when the deployment triggered by start failed Since #6399, Create sends source_code_path, so starting a stopped app makes the backend deploy that source with its own app.yaml, without the bundle's inline config. When that deployment fails, bundle run and lifecycle.started returned its error instead of running the bundle's deployment, which replaces it. cloud: TestAccept/bundle/resources/apps/inline_config Co-authored-by: Isaac --- bundle/appdeploy/app.go | 34 +++++++++++++++++++-------- bundle/appdeploy/app_test.go | 45 ++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 10 deletions(-) create mode 100644 bundle/appdeploy/app_test.go diff --git a/bundle/appdeploy/app.go b/bundle/appdeploy/app.go index 4f590be60ac..60a2c168f03 100644 --- a/bundle/appdeploy/app.go +++ b/bundle/appdeploy/app.go @@ -51,24 +51,22 @@ func BuildDeployment(sourcePath string, config *resources.AppConfig, gitSource * } // WaitForDeploymentToComplete waits for active and pending deployments on an app to finish. +// A deployment that ends in FAILED does not stop the caller: every caller deploys next, +// and the new deployment replaces the failed one. Starting an app whose source_code_path +// was set at Create triggers such a deployment, built from the app.yaml in the source +// rather than from the bundle's inline config. func WaitForDeploymentToComplete(ctx context.Context, w *databricks.WorkspaceClient, app *sdkapps.App) error { - if app.ActiveDeployment != nil && - app.ActiveDeployment.Status != nil && - app.ActiveDeployment.Status.State == sdkapps.AppDeploymentStateInProgress { + if isInProgress(app.ActiveDeployment) { logProgress(ctx, "Waiting for the active deployment to complete...") - _, err := w.Apps.WaitGetDeploymentAppSucceeded(ctx, app.Name, app.ActiveDeployment.DeploymentId, 20*time.Minute, nil) - if err != nil { + if err := waitForDeployment(ctx, w, app.Name, app.ActiveDeployment.DeploymentId); err != nil { return err } logProgress(ctx, "Active deployment is completed!") } - if app.PendingDeployment != nil && - app.PendingDeployment.Status != nil && - app.PendingDeployment.Status.State == sdkapps.AppDeploymentStateInProgress { + if isInProgress(app.PendingDeployment) { logProgress(ctx, "Waiting for the pending deployment to complete...") - _, err := w.Apps.WaitGetDeploymentAppSucceeded(ctx, app.Name, app.PendingDeployment.DeploymentId, 20*time.Minute, nil) - if err != nil { + if err := waitForDeployment(ctx, w, app.Name, app.PendingDeployment.DeploymentId); err != nil { return err } logProgress(ctx, "Pending deployment is completed!") @@ -77,6 +75,22 @@ func WaitForDeploymentToComplete(ctx context.Context, w *databricks.WorkspaceCli return nil } +func isInProgress(d *sdkapps.AppDeployment) bool { + return d != nil && d.Status != nil && d.Status.State == sdkapps.AppDeploymentStateInProgress +} + +func waitForDeployment(ctx context.Context, w *databricks.WorkspaceClient, appName, deploymentID string) error { + var last *sdkapps.AppDeployment + _, err := w.Apps.WaitGetDeploymentAppSucceeded(ctx, appName, deploymentID, 20*time.Minute, func(d *sdkapps.AppDeployment) { + last = d + }) + if err != nil && last != nil && last.Status != nil && last.Status.State == sdkapps.AppDeploymentStateFailed { + logProgress(ctx, fmt.Sprintf("Deployment %s failed (%s), deploying again", deploymentID, last.Status.Message)) + return nil + } + return err +} + // Deploy deploys the app using the provided deployment request. // If another deployment is in progress, it waits for it to complete and retries. func Deploy(ctx context.Context, w *databricks.WorkspaceClient, appName string, deployment sdkapps.AppDeployment) error { diff --git a/bundle/appdeploy/app_test.go b/bundle/appdeploy/app_test.go new file mode 100644 index 00000000000..79e860c4dfd --- /dev/null +++ b/bundle/appdeploy/app_test.go @@ -0,0 +1,45 @@ +package appdeploy + +import ( + "testing" + + "github.com/databricks/cli/libs/cmdio" + "github.com/databricks/cli/libs/testserver" + "github.com/databricks/databricks-sdk-go" + sdkapps "github.com/databricks/databricks-sdk-go/service/apps" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func newTestClient(t *testing.T, state sdkapps.AppDeploymentState) *databricks.WorkspaceClient { + server := testserver.New(t) + server.Handle("GET", "/api/2.0/apps/{name}/deployments/{deployment_id}", func(req testserver.Request) any { + return sdkapps.AppDeployment{ + DeploymentId: req.Vars["deployment_id"], + Status: &sdkapps.AppDeploymentStatus{State: state, Message: "app exited unexpectedly"}, + } + }) + w, err := databricks.NewWorkspaceClient(&databricks.Config{Host: server.URL, Token: "testtoken"}) + require.NoError(t, err) + return w +} + +func inProgressApp() *sdkapps.App { + return &sdkapps.App{ + Name: "myapp", + ActiveDeployment: &sdkapps.AppDeployment{ + DeploymentId: "d1", + Status: &sdkapps.AppDeploymentStatus{State: sdkapps.AppDeploymentStateInProgress}, + }, + } +} + +func TestWaitForDeploymentToCompleteIgnoresFailedDeployment(t *testing.T) { + w := newTestClient(t, sdkapps.AppDeploymentStateFailed) + assert.NoError(t, WaitForDeploymentToComplete(cmdio.MockDiscard(t.Context()), w, inProgressApp())) +} + +func TestWaitForDeploymentToCompleteSucceeded(t *testing.T) { + w := newTestClient(t, sdkapps.AppDeploymentStateSucceeded) + assert.NoError(t, WaitForDeploymentToComplete(cmdio.MockDiscard(t.Context()), w, inProgressApp())) +} From 1b56ccfb5c41c24bfbd3786b10ded0d4ff1fd068 Mon Sep 17 00:00:00 2001 From: "denis.bilenko" Date: Wed, 18 Nov 2026 19:35:59 +0000 Subject: [PATCH 2/2] =?UTF-8?q?Drop=20the=20=E2=9C=93=20on=20the=20failed-?= =?UTF-8?q?deployment=20line,=20test=20that=20GET=20errors=20are=20returne?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cloud: TestAccept/bundle/resources/apps/inline_config Co-authored-by: Isaac --- bundle/appdeploy/app.go | 24 ++++++++++++++++-------- bundle/appdeploy/app_test.go | 31 +++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/bundle/appdeploy/app.go b/bundle/appdeploy/app.go index 60a2c168f03..72b22eb4181 100644 --- a/bundle/appdeploy/app.go +++ b/bundle/appdeploy/app.go @@ -58,18 +58,24 @@ func BuildDeployment(sourcePath string, config *resources.AppConfig, gitSource * func WaitForDeploymentToComplete(ctx context.Context, w *databricks.WorkspaceClient, app *sdkapps.App) error { if isInProgress(app.ActiveDeployment) { logProgress(ctx, "Waiting for the active deployment to complete...") - if err := waitForDeployment(ctx, w, app.Name, app.ActiveDeployment.DeploymentId); err != nil { + succeeded, err := waitForDeployment(ctx, w, app.Name, app.ActiveDeployment.DeploymentId) + if err != nil { return err } - logProgress(ctx, "Active deployment is completed!") + if succeeded { + logProgress(ctx, "Active deployment is completed!") + } } if isInProgress(app.PendingDeployment) { logProgress(ctx, "Waiting for the pending deployment to complete...") - if err := waitForDeployment(ctx, w, app.Name, app.PendingDeployment.DeploymentId); err != nil { + succeeded, err := waitForDeployment(ctx, w, app.Name, app.PendingDeployment.DeploymentId) + if err != nil { return err } - logProgress(ctx, "Pending deployment is completed!") + if succeeded { + logProgress(ctx, "Pending deployment is completed!") + } } return nil @@ -79,16 +85,18 @@ func isInProgress(d *sdkapps.AppDeployment) bool { return d != nil && d.Status != nil && d.Status.State == sdkapps.AppDeploymentStateInProgress } -func waitForDeployment(ctx context.Context, w *databricks.WorkspaceClient, appName, deploymentID string) error { +// waitForDeployment reports whether the deployment succeeded. A FAILED deployment is +// not an error, see WaitForDeploymentToComplete. +func waitForDeployment(ctx context.Context, w *databricks.WorkspaceClient, appName, deploymentID string) (bool, error) { var last *sdkapps.AppDeployment _, err := w.Apps.WaitGetDeploymentAppSucceeded(ctx, appName, deploymentID, 20*time.Minute, func(d *sdkapps.AppDeployment) { last = d }) if err != nil && last != nil && last.Status != nil && last.Status.State == sdkapps.AppDeploymentStateFailed { - logProgress(ctx, fmt.Sprintf("Deployment %s failed (%s), deploying again", deploymentID, last.Status.Message)) - return nil + cmdio.LogString(ctx, fmt.Sprintf("Deployment %s failed (%s), deploying again", deploymentID, last.Status.Message)) + return false, nil } - return err + return err == nil, err } // Deploy deploys the app using the provided deployment request. diff --git a/bundle/appdeploy/app_test.go b/bundle/appdeploy/app_test.go index 79e860c4dfd..12df419366b 100644 --- a/bundle/appdeploy/app_test.go +++ b/bundle/appdeploy/app_test.go @@ -11,17 +11,21 @@ import ( "github.com/stretchr/testify/require" ) -func newTestClient(t *testing.T, state sdkapps.AppDeploymentState) *databricks.WorkspaceClient { +func newTestClient(t *testing.T, handler testserver.HandlerFunc) *databricks.WorkspaceClient { server := testserver.New(t) - server.Handle("GET", "/api/2.0/apps/{name}/deployments/{deployment_id}", func(req testserver.Request) any { + server.Handle("GET", "/api/2.0/apps/{name}/deployments/{deployment_id}", handler) + w, err := databricks.NewWorkspaceClient(&databricks.Config{Host: server.URL, Token: "testtoken"}) + require.NoError(t, err) + return w +} + +func deploymentIn(state sdkapps.AppDeploymentState) testserver.HandlerFunc { + return func(req testserver.Request) any { return sdkapps.AppDeployment{ DeploymentId: req.Vars["deployment_id"], Status: &sdkapps.AppDeploymentStatus{State: state, Message: "app exited unexpectedly"}, } - }) - w, err := databricks.NewWorkspaceClient(&databricks.Config{Host: server.URL, Token: "testtoken"}) - require.NoError(t, err) - return w + } } func inProgressApp() *sdkapps.App { @@ -35,11 +39,22 @@ func inProgressApp() *sdkapps.App { } func TestWaitForDeploymentToCompleteIgnoresFailedDeployment(t *testing.T) { - w := newTestClient(t, sdkapps.AppDeploymentStateFailed) + w := newTestClient(t, deploymentIn(sdkapps.AppDeploymentStateFailed)) assert.NoError(t, WaitForDeploymentToComplete(cmdio.MockDiscard(t.Context()), w, inProgressApp())) } func TestWaitForDeploymentToCompleteSucceeded(t *testing.T) { - w := newTestClient(t, sdkapps.AppDeploymentStateSucceeded) + w := newTestClient(t, deploymentIn(sdkapps.AppDeploymentStateSucceeded)) assert.NoError(t, WaitForDeploymentToComplete(cmdio.MockDiscard(t.Context()), w, inProgressApp())) } + +func TestWaitForDeploymentToCompleteReturnsGetError(t *testing.T) { + w := newTestClient(t, func(req testserver.Request) any { + return testserver.Response{ + StatusCode: 404, + Body: map[string]string{"error_code": "NOT_FOUND", "message": "deployment not found"}, + } + }) + err := WaitForDeploymentToComplete(cmdio.MockDiscard(t.Context()), w, inProgressApp()) + assert.ErrorContains(t, err, "deployment not found") +}