Commit 184f27f
committed
fix/core: use CAS to protect against concurrent TX state changes
Concurrent use a of a connection across multiple threads is not supported,
but we should not crash even if a client attempts to do so.
We do crash when this happens. See: #3911
The proper behavior is to return Busy if the same connection is already doing
transactional work on another thread.
To ensure the above, this PR implements Connection::atomic_swap_tx_state() which
uses CAS instead of simply setting the state.
This PR also adds a regression test modeled after the reproduction in #3911 that
only accepts `"database is locked"` errors and panics on anything else.1 parent caa71ea commit 184f27f
File tree
6 files changed
+145
-11
lines changed- bindings/rust
- tests
- core
- vdbe
- macros/src
6 files changed
+145
-11
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 | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
1 | 3 | | |
2 | 4 | | |
3 | 5 | | |
| |||
531 | 533 | | |
532 | 534 | | |
533 | 535 | | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2623 | 2623 | | |
2624 | 2624 | | |
2625 | 2625 | | |
| 2626 | + | |
| 2627 | + | |
| 2628 | + | |
| 2629 | + | |
| 2630 | + | |
| 2631 | + | |
| 2632 | + | |
| 2633 | + | |
| 2634 | + | |
| 2635 | + | |
2626 | 2636 | | |
2627 | 2637 | | |
2628 | 2638 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2234 | 2234 | | |
2235 | 2235 | | |
2236 | 2236 | | |
| 2237 | + | |
| 2238 | + | |
| 2239 | + | |
| 2240 | + | |
| 2241 | + | |
| 2242 | + | |
| 2243 | + | |
| 2244 | + | |
| 2245 | + | |
| 2246 | + | |
| 2247 | + | |
| 2248 | + | |
| 2249 | + | |
| 2250 | + | |
| 2251 | + | |
| 2252 | + | |
2237 | 2253 | | |
2238 | 2254 | | |
2239 | 2255 | | |
| |||
2275 | 2291 | | |
2276 | 2292 | | |
2277 | 2293 | | |
2278 | | - | |
| 2294 | + | |
| 2295 | + | |
| 2296 | + | |
| 2297 | + | |
| 2298 | + | |
| 2299 | + | |
| 2300 | + | |
| 2301 | + | |
| 2302 | + | |
| 2303 | + | |
| 2304 | + | |
| 2305 | + | |
| 2306 | + | |
| 2307 | + | |
| 2308 | + | |
| 2309 | + | |
2279 | 2310 | | |
2280 | 2311 | | |
2281 | 2312 | | |
| |||
2286 | 2317 | | |
2287 | 2318 | | |
2288 | 2319 | | |
| 2320 | + | |
| 2321 | + | |
| 2322 | + | |
| 2323 | + | |
2289 | 2324 | | |
2290 | 2325 | | |
2291 | 2326 | | |
| |||
2318 | 2353 | | |
2319 | 2354 | | |
2320 | 2355 | | |
| 2356 | + | |
| 2357 | + | |
| 2358 | + | |
| 2359 | + | |
2321 | 2360 | | |
2322 | 2361 | | |
2323 | 2362 | | |
| |||
2344 | 2383 | | |
2345 | 2384 | | |
2346 | 2385 | | |
2347 | | - | |
2348 | 2386 | | |
2349 | 2387 | | |
2350 | | - | |
| 2388 | + | |
| 2389 | + | |
2351 | 2390 | | |
2352 | 2391 | | |
2353 | 2392 | | |
2354 | 2393 | | |
2355 | 2394 | | |
2356 | | - | |
2357 | | - | |
2358 | | - | |
| 2395 | + | |
2359 | 2396 | | |
2360 | 2397 | | |
2361 | 2398 | | |
2362 | 2399 | | |
2363 | | - | |
2364 | | - | |
2365 | | - | |
2366 | | - | |
2367 | | - | |
2368 | 2400 | | |
2369 | 2401 | | |
2370 | 2402 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
263 | 263 | | |
264 | 264 | | |
265 | 265 | | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
266 | 283 | | |
267 | 284 | | |
268 | 285 | | |
| |||
0 commit comments