Skip to content

Commit e113406

Browse files
committed
rm unnecessarial SERIAL replacement
1 parent f27e4ca commit e113406

10 files changed

Lines changed: 11 additions & 15 deletions

File tree

acceptance/bundle/deploy/wal/chain-3-jobs/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Exit code: [KILLED]
1111
{
1212
"cli_version": "[DEV_VERSION]",
1313
"lineage": "[UUID]",
14-
"serial": [SERIAL],
14+
"serial": 1,
1515
"state_version": 2
1616
}
1717
{

acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
=== WAL content ===
2-
{"lineage":"test-lineage-123","serial": [SERIAL]}
2+
{"lineage":"test-lineage-123","serial":6}
33
{"k":"resources.jobs.valid_job","v":{"__id__":"[JOB1_ID]","state":{"name":"valid-job"}}}
44
{"k":"resources.jobs.another_valid","v":{"__id__":"[JOB2_ID]","state":{"name":"another-valid"}}}
55
{"k":"resources.jobs.partial_write","v":{"__id__":"33","state":{"name":"partial-=== Deploy (should recover valid entries, skip corrupted last line) ===

acceptance/bundle/deploy/wal/crash-after-create/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Deploying resources...
88
Exit code: [KILLED]
99
=== WAL should exist after crash ===
1010
WAL exists (expected)
11-
{"lineage":"[UUID]","serial": [SERIAL],"state_version":2,"cli_version":"[DEV_VERSION]"}
11+
{"lineage":"[UUID]","serial":1,"state_version":2,"cli_version":"[DEV_VERSION]"}
1212
{"k":"resources.jobs.job_a","v":{"__id__":"1001","state":{"deployment":{"kind":"BUNDLE","metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/wal-crash-test/default/state/metadata.json"},"description":"first job","edit_mode":"UI_LOCKED","format":"MULTI_TASK","max_concurrent_runs":1,"name":"test-job-a","queue":{"enabled":true},"tasks":[{"new_cluster":{"node_type_id":"[NODE_TYPE_ID]","num_workers":0,"spark_version":"15.4.x-scala2.12"},"spark_python_task":{"python_file":"/Workspace/Users/[USERNAME]/.bundle/wal-crash-test/default/files/test.py"},"task_key":"task-a"}]}}}
1313
=== State file after crash (should be empty) ===
1414
cat: .databricks/bundle/default/resources.json: No such file or directory

acceptance/bundle/deploy/wal/empty-wal/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Corrupted WAL file missing (expected)
1616
=== State file content ===
1717
{
1818
"lineage": "[UUID]",
19-
"serial": [SERIAL],
19+
"serial": 1,
2020
"state_keys": [
2121
"resources.jobs.test_job"
2222
]

acceptance/bundle/deploy/wal/future-serial-wal/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
=== WAL content ===
2-
{"lineage":"test-lineage-123","serial": [SERIAL]}
2+
{"lineage":"test-lineage-123","serial":5}
33
{"k":"resources.jobs.test_job","v":{"__id__":"1001","state":{"name":"test-job"}}}
44
=== Deploy (should fail with corruption error) ===
55

acceptance/bundle/deploy/wal/lineage-mismatch/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
=== WAL content ===
2-
{"lineage":"wal-lineage-bbb","serial": [SERIAL]}
2+
{"lineage":"wal-lineage-bbb","serial":2}
33
{"k":"resources.jobs.test_job","v":{"__id__":"1001","state":{"name":"test-job"}}}
44
=== Deploy (should fail with lineage mismatch error) ===
55

acceptance/bundle/deploy/wal/normal-deploy/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WAL file deleted after successful deploy (expected)
99
=== State file content ===
1010
{
1111
"lineage": "[UUID]",
12-
"serial": [SERIAL],
12+
"serial": 1,
1313
"state_keys": [
1414
"resources.jobs.test_job"
1515
]

acceptance/bundle/deploy/wal/stale-wal/output.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
=== WAL content before deploy ===
2-
{"lineage":"stale-test-lineage","serial": [SERIAL]}
2+
{"lineage":"stale-test-lineage","serial":1}
33
{"k":"resources.jobs.stale_job","v":{"__id__":"9999","state":{"name":"stale-job"}}}
44
=== Deploy (should ignore stale WAL) ===
55

@@ -12,7 +12,7 @@ Deployment complete!
1212
Stale WAL deleted (expected)
1313
=== State file should NOT contain stale_job ===
1414
{
15-
"serial": [SERIAL],
15+
"serial": 3,
1616
"state_keys": [
1717
"resources.jobs.test_job"
1818
]

acceptance/bundle/deploy/wal/test.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ Exit code: [KILLED]"""
4242
Old = '"lineage":\s*"[0-9a-f-]+"'
4343
New = '"lineage": "[UUID]"'
4444

45-
[[Repls]]
46-
Old = '"serial":\s*\d+'
47-
New = '"serial": [SERIAL]'
48-
4945
# Strip single-node cluster warnings (they appear in varying order and aren't relevant to WAL tests)
5046
[[Repls]]
5147
Old = '(?s)Warning: Single node cluster.*?ResourceClass: SingleNode\n \n\n'

acceptance/bundle/deploy/wal/wal-with-delete/output.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
=== WAL content ===
2-
{"lineage":"delete-test-lineage","serial": [SERIAL]}
2+
{"lineage":"delete-test-lineage","serial":2}
33
{"k":"resources.jobs.test_job","v":null}
44
=== Deploy (should recover delete from WAL) ===
55

@@ -10,7 +10,7 @@ Updating deployment state...
1010
Deployment complete!
1111
=== Final state (should have no jobs) ===
1212
{
13-
"serial": [SERIAL],
13+
"serial": 2,
1414
"state_keys": []
1515
}
1616
=== WAL after successful deploy ===

0 commit comments

Comments
 (0)