Skip to content

acc: make retry warning order deterministic in sync upload-504 tests - #7604

Merged
denik merged 1 commit into
mainfrom
denik/acc-sync-504-order
Nov 15, 2026
Merged

denik merged 1 commit into
mainfrom
denik/acc-sync-504-order

Conversation

@denik

@denik denik commented Nov 13, 2026

Copy link
Copy Markdown
Contributor

Why

TestAccept/cmd/sync/upload-504 and TestAccept/bundle/sync/upload-504 flake on all three OSes because the retry warning sometimes appears before Action: PUT instead of after it:

-Action: PUT: hello.py
-Warn: retrying after 504 Gateway Timeout from POST /api/2.0/workspace-files/import-file/Users/[USERNAME]/sync-504-[UNIQUE_NAME]/hello.py
+Warn: retrying after 504 Gateway Timeout from POST /api/2.0/workspace-files/import-file/Users/[USERNAME]/sync-504-[UNIQUE_NAME]/hello.py
+Action: PUT: hello.py

Sync progress events are written to stdout by the output goroutine (libs/sync/output.go), while the retry warning is logged to stderr by the uploader, so their relative order is not defined.

Changes

Both scripts redirect the sync command's stderr to a temp file (outside the synced directory, so it is not uploaded) and print it after the command. The output still records the retry warning and both import-file requests; only the warning's position is now fixed.

Tests

go test ./acceptance -run 'TestAccept/(cmd|bundle)/sync/upload-504' -count=20 passes locally.

Dashboard

error snippet
error/3028 Warn: retrying after 504 Gateway Timeout from POST /api/2.0/workspace-files/import-file/[PATH] printed before Action: PUT: hello.py

Tests: TestAccept/cmd/sync/upload-504, TestAccept/bundle/sync/upload-504/DMS=

This pull request and its description were written by Isaac.

Sync progress is written to stdout from the event goroutine, while the
retry warning is logged to stderr, so the two can interleave either way.
Capture stderr separately and print it after the command finishes.

Co-authored-by: Isaac <no-reply@databricks.com>
@denik denik added the ai-auto PRs made by AI loops & factories, label Nov 13, 2026
@github-actions github-actions Bot added DABs DABs related issues test-only-fix PRs that update failing of flaky tests without changing CLI code. labels Nov 13, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Commit: 9fcd3ddcd | Workflow run

Regression test report

Selected 2 changed tests (limit=20, 0 not selected)

3 tests: regression=0 unreleased=0 coverage=3 failing=0
test branch main (c327854) latest (v1.26.0)
TestAccept/bundle/sync/upload-504/DMS= ✅ ✅ ✅
TestAccept/bundle/sync/upload-504/DMS=true ✅ ✅ ✅
TestAccept/cmd/sync/upload-504 ✅ ✅ ✅

@eng-dev-ecosystem-bot

Copy link
Copy Markdown
Collaborator

✅ Integration test report

Commit: 9fcd3dd

Run: 43460361512

Env 🔄​flaky 💚​RECOVERED ✅​pass 🙈​skip Time
💚​ aws linux-2core-8gb 1 270 17 7:48
💚​ aws-windows-latest-4core-16gb 1 272 15 5:41
💚​ azure linux-2core-8gb 1 269 17 5:05
💚​ azure-windows-latest-4core-16gb 1 271 15 6:01
🔄​ gcp linux-2core-8gb 1 1 269 17 8:46
💚​ gcp-windows-latest-4core-16gb 1 272 15 6:02
Test Name aws linux-2core-8gb aws-windows-latest-4core-16gb azure linux-2core-8gb azure-windows-latest-4core-16gb gcp linux-2core-8gb gcp-windows-latest-4core-16gb
💚​ TestAccept 💚​R 💚​R 💚​R 💚​R 💚​R 💚​R
🔄​ TestSyncNestedFolderDoesntFailOnNonEmptyDirectory ✅​p ✅​p ✅​p ✅​p 🔄​f ✅​p
Top 3 slowest tests (at least 2 minutes):
duration env testname
3:22 aws-windows-latest-4core-16gb TestAccept
3:20 gcp-windows-latest-4core-16gb TestAccept
3:14 azure-windows-latest-4core-16gb TestAccept

@denik
denik marked this pull request as ready for review November 13, 2026 18:15
@denik
denik requested review from a team as code owners November 13, 2026 18:15
@denik
denik requested review from andrewnester and anton-107 and removed request for anton-107 November 13, 2026 18:15
@denik
denik enabled auto-merge November 13, 2026 18:15
@denik
denik added this pull request to the merge queue Nov 15, 2026
Merged via the queue into main with commit 8ce564f Nov 15, 2026
28 checks passed
@denik
denik deleted the denik/acc-sync-504-order branch November 15, 2026 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai-auto PRs made by AI loops & factories, DABs DABs related issues test-only-fix PRs that update failing of flaky tests without changing CLI code.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants