From 89931892aa03fd67b5748d885b1c6f2c60f47683 Mon Sep 17 00:00:00 2001 From: "denis.bilenko" Date: Wed, 11 Nov 2026 19:51:05 +0000 Subject: [PATCH] acc: tolerate retried app deployment POST in lifecycle-started tests appdeploy.Deploy retries POST /api/2.0/apps/{name}/deployments after waiting for the in-flight deployment when the first attempt fails. On cloud this happens occasionally right after create/start, so the recorded requests contain the deployment twice. Collapse consecutive duplicates with print_requests.py --unique. Co-authored-by: Isaac --- .../apps/lifecycle-started-toggle/output.txt | 22 +++++++++---------- .../apps/lifecycle-started-toggle/script | 5 +++-- .../apps/lifecycle-started/output.txt | 8 +++---- .../resources/apps/lifecycle-started/script | 12 ++++++---- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt index 0e88990ab01..b9ceb3f7265 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt @@ -9,14 +9,14 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_app_requests { - "body": { - "description": "my_app_description", - "name": "[UNIQUE_NAME]" - }, "method": "POST", "path": "/api/2.0/apps", "q": { "no_compute": "true" + }, + "body": { + "description": "my_app_description", + "name": "[UNIQUE_NAME]" } } @@ -35,17 +35,17 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_app_requests { - "body": {}, "method": "POST", - "path": "/api/2.0/apps/[UNIQUE_NAME]/start" + "path": "/api/2.0/apps/[UNIQUE_NAME]/start", + "body": {} } { + "method": "POST", + "path": "/api/2.0/apps/[UNIQUE_NAME]/deployments", "body": { "mode": "SNAPSHOT", "source_code_path": "/Workspace/Users/[USERNAME]/.bundle/lifecycle-started-toggle-[UNIQUE_NAME]/default/files/app" - }, - "method": "POST", - "path": "/api/2.0/apps/[UNIQUE_NAME]/deployments" + } } >>> errcode [CLI] apps get [UNIQUE_NAME] @@ -63,9 +63,9 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_app_requests { - "body": {}, "method": "POST", - "path": "/api/2.0/apps/[UNIQUE_NAME]/stop" + "path": "/api/2.0/apps/[UNIQUE_NAME]/stop", + "body": {} } >>> errcode [CLI] apps get [UNIQUE_NAME] diff --git a/acceptance/bundle/resources/apps/lifecycle-started-toggle/script b/acceptance/bundle/resources/apps/lifecycle-started-toggle/script index b2a1ad85a63..418fecf9ec0 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started-toggle/script +++ b/acceptance/bundle/resources/apps/lifecycle-started-toggle/script @@ -7,8 +7,9 @@ cleanup() { trap cleanup EXIT print_app_requests() { - jq --sort-keys 'select(.method != "GET" and (.path | contains("/apps")) and (.path | contains("/api/2.0/bundle") | not)) | del(.body.url)' < "$OUT_REQUESTS" - rm "$OUT_REQUESTS" + # --unique: appdeploy.Deploy retries POST .../deployments after waiting when the first + # attempt fails, so on cloud the same request is occasionally recorded twice. + print_requests.py //apps '^//api/2.0/bundle' --del-body url --unique } title "Deploy with started=false: app created without compute (no_compute=true)" diff --git a/acceptance/bundle/resources/apps/lifecycle-started/output.txt b/acceptance/bundle/resources/apps/lifecycle-started/output.txt index ace0ac41a61..60680023e55 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started/output.txt @@ -7,7 +7,7 @@ Created apps.myapp Files: 3 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged ->>> print_requests.py //apps +>>> print_requests.py //apps --unique { "method": "POST", "path": "/api/2.0/apps", @@ -38,7 +38,7 @@ Updated apps.myapp Files: 1 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged ->>> print_requests.py //deployments ^//api/2.0/bundle +>>> print_requests.py //deployments ^//api/2.0/bundle --unique { "method": "POST", "path": "/api/2.0/apps/[UNIQUE_NAME]/deployments", @@ -81,7 +81,7 @@ Updated apps.myapp Files: 1 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged ->>> print_requests.py //apps +>>> print_requests.py //apps --unique { "method": "POST", "path": "/api/2.0/apps/[UNIQUE_NAME]/stop", @@ -114,7 +114,7 @@ Updated apps.myapp Files: 1 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged ->>> print_requests.py //apps +>>> print_requests.py //apps --unique { "method": "POST", "path": "/api/2.0/apps/[UNIQUE_NAME]/update", diff --git a/acceptance/bundle/resources/apps/lifecycle-started/script b/acceptance/bundle/resources/apps/lifecycle-started/script index 20d8a9e6fd7..a251e178f9c 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started/script +++ b/acceptance/bundle/resources/apps/lifecycle-started/script @@ -6,16 +6,20 @@ cleanup() { } trap cleanup EXIT +# --unique: appdeploy.Deploy retries POST .../deployments after waiting when the first +# attempt fails (e.g. a deployment is already in progress right after start), so on +# cloud the same request is occasionally recorded twice. + title "Deploy with started=true: app created with compute running" trace errcode $CLI bundle deploy -trace print_requests.py //apps +trace print_requests.py //apps --unique rm -f "$OUT_REQUESTS" { trace errcode $CLI apps get $UNIQUE_NAME | jq '.compute_status.state'; } || true title "Re-deploy with description change: code deployed again" trace update_file.py databricks.yml my_app_description MY_APP_DESCRIPTION trace errcode $CLI bundle deploy -trace print_requests.py //deployments ^//api/2.0/bundle +trace print_requests.py //deployments ^//api/2.0/bundle --unique rm -f "$OUT_REQUESTS" title "Stop app externally while config says started=true: plan detects drift" @@ -31,7 +35,7 @@ title "Stop app externally, then deploy with started=false: app stays stopped" trace update_file.py databricks.yml "started: true" "started: false" trace update_file.py databricks.yml MY_APP_DESCRIPTION MY_APP_DESCRIPTION_2 trace errcode $CLI bundle deploy -trace print_requests.py //apps +trace print_requests.py //apps --unique rm -f "$OUT_REQUESTS" { trace errcode $CLI apps get $UNIQUE_NAME | jq '.compute_status.state'; } || true @@ -39,6 +43,6 @@ title "Deploy with started=true: compute restarted and code deployed" trace update_file.py databricks.yml "started: false" "started: true" trace update_file.py databricks.yml MY_APP_DESCRIPTION_2 MY_APP_DESCRIPTION_3 trace errcode $CLI bundle deploy -trace print_requests.py //apps +trace print_requests.py //apps --unique rm -f "$OUT_REQUESTS" { trace errcode $CLI apps get $UNIQUE_NAME | jq '.compute_status.state'; } || true