Repository navigation
Commit d3406c6
authored
fix: let Comet memory pools overcommit on grow instead of panicking (#6128)
* fix: let Comet memory pools overcommit on grow instead of panicking
MemoryPool::grow must always succeed: DataFusion calls it for memory that
already exists, such as a spilled batch the sort-merge join reads back. Both
Comet pools implemented it as try_grow().unwrap(), so a partial grant from
Spark panicked the task. Record the full amount, carry the ungranted part as
overcommit, and repay it on shrink before releasing bytes to Spark, so Spark
is still never handed back more than it granted (#1733).
Closes #6127.
* refactor: share Spark memory calls and overcommit between Comet pools
Both pools duplicated the acquire/release JNI calls and wrapped them in the
overcommit ledger separately, and had drifted: only one logged a failed
acquire, and try_grow still used Spark's reply unclamped. Move the JNI calls,
the partial-grant handback and the overcommit into one SparkMemory, generic
over the Spark calls so it is tested with a fake instead of only the ledger.
Skip the atomic write on release when there is no overcommit, and pass the
fair pool its task attempt id for the warning.
* fix: make unified try_grow repay overcommit and address review feedback
- try_acquire asks Spark for outstanding overcommit on top of the
request, so greedy_unified refuses try_grow while in debt instead of
letting shortfalls compound unseen by Spark
- document the invariant that keeps Spark from being over-released
- replace the generic manager with Box<dyn SparkMemoryManager>, keep
task_attempt_id in SparkMemory only, add pool test constructors
- pool-level tests that fail with the old try_grow().unwrap() grow
- saturating_add in both pools' grow
- report overcommit in Display and try_grow errors
- update the memory management contributor guide
* test: drive the try_acquire repayment race and update the memory review skill
Add a deterministic test that lands a concurrent release inside
try_acquire's call to Spark, after it has read the debt and before it
repays it, and a multi-threaded stress test of CometUnifiedMemoryPool
that checks Spark is handed back exactly what it granted.
SparkMemoryManager is now Send + Sync so the fake can be shared across
threads, and the fake uses parking_lot so that one failed assertion does
not poison the lock for every other thread.
grow no longer panics when Spark grants less than asked, so the memory
review skill now tells reviewers to treat a new grow call site as
potential unbacked memory, and notes that only grow keeps a partial
grant.
* chore: drop the memory pools' redundant unsafe Send and Sync impls
With SparkMemoryManager now Send + Sync, both pools are Send and Sync
without them, and the compiler checks it: removing the bound makes the
MemoryPool impls fail to compile. Since SparkMemory started holding a
Box<dyn SparkMemoryManager>, these unsafe impls were the only thing
satisfying MemoryPool's Send + Sync bound, and would have let a manager
that is not thread-safe through.1 parent 466e3fe commit d3406c6
6 files changed
Lines changed: 563 additions & 87 deletions
File tree
- .ai/skills/review-comet-memory-pr
- docs/source/contributor-guide
- native/core/src/execution/memory_pools
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
71 | | - | |
72 | | - | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
73 | 78 | | |
74 | 79 | | |
75 | | - | |
76 | | - | |
| 80 | + | |
| 81 | + | |
77 | 82 | | |
78 | 83 | | |
79 | 84 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
236 | 236 | | |
237 | 237 | | |
238 | 238 | | |
239 | | - | |
240 | | - | |
| 239 | + | |
| 240 | + | |
241 | 241 | | |
242 | 242 | | |
243 | 243 | | |
| |||
247 | 247 | | |
248 | 248 | | |
249 | 249 | | |
250 | | - | |
| 250 | + | |
251 | 251 | | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
252 | 258 | | |
253 | 259 | | |
254 | 260 | | |
| |||
289 | 295 | | |
290 | 296 | | |
291 | 297 | | |
292 | | - | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
293 | 301 | | |
294 | 302 | | |
295 | 303 | | |
| |||
367 | 375 | | |
368 | 376 | | |
369 | 377 | | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
370 | 384 | | |
371 | 385 | | |
372 | 386 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| 54 | + | |
54 | 55 | | |
55 | 56 | | |
56 | 57 | | |
| |||
59 | 60 | | |
60 | 61 | | |
61 | 62 | | |
| 63 | + | |
62 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
63 | 72 | | |
64 | | - | |
| 73 | + | |
65 | 74 | | |
66 | 75 | | |
67 | 76 | | |
68 | 77 | | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | 78 | | |
85 | 79 | | |
86 | 80 | | |
87 | 81 | | |
88 | 82 | | |
89 | 83 | | |
90 | 84 | | |
91 | | - | |
92 | | - | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
93 | 90 | | |
94 | 91 | | |
95 | 92 | | |
96 | 93 | | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | 94 | | |
101 | 95 | | |
102 | 96 | | |
| |||
118 | 112 | | |
119 | 113 | | |
120 | 114 | | |
| 115 | + | |
| 116 | + | |
121 | 117 | | |
122 | | - | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
123 | 124 | | |
124 | 125 | | |
125 | 126 | | |
| |||
134 | 135 | | |
135 | 136 | | |
136 | 137 | | |
137 | | - | |
| 138 | + | |
| 139 | + | |
138 | 140 | | |
139 | 141 | | |
140 | 142 | | |
| |||
158 | 160 | | |
159 | 161 | | |
160 | 162 | | |
161 | | - | |
| 163 | + | |
| 164 | + | |
162 | 165 | | |
163 | 166 | | |
164 | 167 | | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
| 168 | + | |
| 169 | + | |
172 | 170 | | |
173 | | - | |
| 171 | + | |
174 | 172 | | |
175 | | - | |
| 173 | + | |
| 174 | + | |
176 | 175 | | |
177 | 176 | | |
178 | 177 | | |
| |||
188 | 187 | | |
189 | 188 | | |
190 | 189 | | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
66 | 67 | | |
67 | 68 | | |
68 | 69 | | |
| 70 | + | |
69 | 71 | | |
70 | 72 | | |
71 | 73 | | |
| |||
0 commit comments