Skip to content

[local cache] Fix race condition in acceptance tests #3687

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

Draft
wants to merge 5 commits into
base: anton-107/cache-control-flow
Choose a base branch
from
+7 −5
Draft

[local cache] Fix race condition in acceptance tests #3687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09ebc5a
use a temp dir for each acceptance test; ignore the cache folder in a…
anton-107 Sep 30, 2025
db43540
exclude .cache folder from sync in bundle/sync and artifacts/whl_chan…
anton-107 Sep 30, 2025
5acd44a
exclude .cache folder from sync in sync/dryrun test
anton-107 Sep 30, 2025
1c73f05
make tests use .databricks/.cache as a local cache folder
anton-107 Sep 30, 2025
07c39c2
disable local cache in bundle/resource_deps/resources_var test
anton-107 Oct 1, 2025
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
4 changes: 1 addition & 3 deletions acceptance/acceptance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,7 @@ func runTest(t *testing.T,
}

// Set unique cache folder for this test to avoid race conditions between parallel tests
userCacheDir, err := os.UserCacheDir()
require.NoError(t, err)
uniqueCacheDir := filepath.Join(userCacheDir, strings.ReplaceAll(dir, string(os.PathSeparator), "--"))
uniqueCacheDir := filepath.Join(tmpDir, ".databricks", ".cache")
cmd.Env = append(cmd.Env, "DATABRICKS_CACHE_FOLDER="+uniqueCacheDir)

for _, key := range utils.SortedKeys(config.Env) {
Expand Down
2 changes: 0 additions & 2 deletions acceptance/bundle/resource_deps/resources_var/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ experimental.use_legacy_run_as false
has_classic_interactive_compute false
has_classic_job_compute false
has_serverless_compute false
local.cache.attempt true
local.cache.hit true
presets_name_prefix_is_set true
python_wheel_wrapper_is_set false
resref_volumes.catalog_name true
Expand Down
1 change: 1 addition & 0 deletions acceptance/bundle/resource_deps/resources_var/script
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export DATABRICKS_CACHE_DISABLED=true
trace $CLI bundle validate -t dev -o json | jq .resources
trace errcode $CLI bundle deploy -t dev &> out.deploy.txt
trace jq -s '.[] | select(.path=="/api/2.0/pipelines") | .body.name' out.requests.txt
Expand Down
5 changes: 5 additions & 0 deletions acceptance/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ Env.PYTHONUTF8 = "1"
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct-exp"]
EnvRepl.DATABRICKS_BUNDLE_ENGINE = false

# Each test in the suite is using a dedicated .cache folder, this folder is ignored by the test runner:
Ignore = [
'.databricks/.cache',
]

# >>> datetime.datetime.fromtimestamp(18000000000)
# datetime.datetime(2027, 1, 15, 9, 0)
# >>> datetime.datetime.fromtimestamp(1900000000)
Expand Down
Loading