Commit b12da8d
authored
fix(tee): correct previous fix for race condition in batch locking (#3358)
## What ❔
Commit a7dc0ed (PR #3342) was supposed
to fix a race condition in batch locking by introducing SQL row-locking,
but it [didn't work][2] as expected.

Now we are switching back to coarser-grained table-level locking as
[originally suggested][1] by Harald. The original fix was hard to test
unless deployed to `stage` due to the undeterministic nature of the
problem, so we needed to merge it to the `main` branch to properly test
it.
[1]:
#3342 (comment)
[2]: https://grafana.matterlabs.dev/goto/AhEd5FVNg?orgId=1
## Why ❔
To fix the bug that only activates after running `zksync-tee-prover` on
multiple instances.
## Checklist
- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev
lint`.1 parent dc2c476 commit b12da8d
File tree
2 files changed
+12
-8
lines changed- core/lib/dal
- .sqlx
- src
2 files changed
+12
-8
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
73 | 79 | | |
74 | 80 | | |
75 | 81 | | |
| |||
95 | 101 | | |
96 | 102 | | |
97 | 103 | | |
98 | | - | |
99 | | - | |
100 | 104 | | |
101 | 105 | | |
102 | 106 | | |
| |||
0 commit comments