Skip to content

Commit aa0b9d6

Browse files
Sankalp-MittalIsaac
andcommitted
acceptance: use ** for import-file fault patterns
Since #7241, * in a fault pattern matches within one path segment and ** across segments. Upload paths span many segments, so the faults stopped firing. Co-authored-by: Isaac <no-reply@databricks.com>
1 parent caa6cf4 commit aa0b9d6

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

  • acceptance

‎acceptance/bundle/deploy/files/upload-504/script‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Let the two deploy lock requests through, then inject a single 504 on the next import request, which is a file upload.
22
# Uploads overwrite, so they are retried and the deploy succeeds.
3-
fault.py "POST /api/2.0/workspace-files/import-file/*" 504 2 1
3+
fault.py "POST /api/2.0/workspace-files/import-file/**" 504 2 1
44

55
$CLI bundle deploy
66

‎acceptance/bundle/destroy/force-lock-node-limit/script‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ title "Deploy (creates the job and the deployment)"
77
trace $CLI bundle deploy
88

99
title "destroy without --force-lock (lock write hits the node limit: aborts)"
10-
fault.py "POST /api/2.0/workspace-files/import-file/*" 403 0 1 MAX_CHILD_NODE_SIZE_EXCEEDED
10+
fault.py "POST /api/2.0/workspace-files/import-file/**" 403 0 1 MAX_CHILD_NODE_SIZE_EXCEEDED
1111
trace errcode $CLI bundle destroy --auto-approve
1212

1313
title "destroy with --force-lock (tolerates the node limit: proceeds and completes)"
14-
fault.py "POST /api/2.0/workspace-files/import-file/*" 403 0 1 MAX_CHILD_NODE_SIZE_EXCEEDED
14+
fault.py "POST /api/2.0/workspace-files/import-file/**" 403 0 1 MAX_CHILD_NODE_SIZE_EXCEEDED
1515
trace $CLI bundle destroy --force-lock --auto-approve

‎acceptance/bundle/sync/upload-504/script‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Inject a single 504 on the first file upload. Uploads overwrite, so they are retried and the sync succeeds.
2-
fault.py "POST /api/2.0/workspace-files/import-file/*" 504 0 1
2+
fault.py "POST /api/2.0/workspace-files/import-file/**" 504 0 1
33

44
$CLI bundle sync
55

‎acceptance/cmd/sync/upload-504/script‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cleanup() {
1515
trap cleanup EXIT
1616

1717
# Inject a single 504 on the first file upload. Uploads overwrite, so they are retried and the sync succeeds.
18-
fault.py "POST /api/2.0/workspace-files/import-file/*" 504 0 1
18+
fault.py "POST /api/2.0/workspace-files/import-file/**" 504 0 1
1919

2020
# MSYS_NO_PATHCONV=1 prevents Git Bash on Windows from converting /Users/... to C:/Program Files/Git/Users/...
2121
MSYS_NO_PATHCONV=1 $CLI sync . "$remote_dir"

0 commit comments

Comments
 (0)