Commit 53bab20
committed
fix(qwp): move closed-mid-creation delegate teardown outside the pool lock
When borrow()/acquire() re-locks after building a fresh delegate and finds
the pool closed, both pools tore the delegate down while holding the pool
lock. A delegate close() can block for seconds (5s ack drain, ~3s drainer-
pool wind-down, 5s dispatch-thread join) or longer (unbounded I/O-thread
latch await behind an OS-level connect when connect_timeout=0), stalling
close(), giveBack/retireLease, reapIdle and watchdog cancels behind it --
violating retireLease's close-outside-the-lock contract on the ingest side
and cancelIfCurrent's held-only-briefly contract on the egress side.
SenderPool now mirrors retireLease: accounting under the lock (move the SF
slot reservation from inFlightCreations to closingSlots, bump
pendingLeaseTeardowns so close()'s outstanding-teardown wait sees the
in-flight close), delegate close outside, re-lock to reclaim the slot and
signal. QueryClientPool simply unlocks before shutdown(): the fresh worker
never entered `all`, so close()'s snapshot loop cannot race the teardown.
RED/GREEN regression tests park a fake delegate mid-close and prove the
pool lock stays free (probe close() completes), close() still waits for the
teardown to finish, and the closed-mid-creation worker teardown leaks no
native scratch.1 parent 2a9b4cd commit 53bab20
4 files changed
Lines changed: 335 additions & 2 deletions
File tree
- core/src
- main/java/io/questdb/client/impl
- test/java/io/questdb/client/test/impl
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
255 | 255 | | |
256 | 256 | | |
257 | 257 | | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
258 | 268 | | |
259 | 269 | | |
260 | 270 | | |
| |||
Lines changed: 30 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
726 | 726 | | |
727 | 727 | | |
728 | 728 | | |
729 | | - | |
730 | | - | |
| 729 | + | |
| 730 | + | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
| 738 | + | |
| 739 | + | |
| 740 | + | |
| 741 | + | |
| 742 | + | |
| 743 | + | |
| 744 | + | |
| 745 | + | |
731 | 746 | | |
732 | 747 | | |
733 | 748 | | |
734 | 749 | | |
735 | 750 | | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
| 759 | + | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
736 | 764 | | |
737 | 765 | | |
738 | 766 | | |
| |||
Lines changed: 72 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
| 38 | + | |
37 | 39 | | |
| 40 | + | |
38 | 41 | | |
39 | 42 | | |
40 | 43 | | |
| |||
221 | 224 | | |
222 | 225 | | |
223 | 226 | | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
224 | 296 | | |
225 | 297 | | |
226 | 298 | | |
| |||
0 commit comments