Repository navigation
Commit 15305af
fix: apply the session's Comet configs in map stages of jobs outside a SQL execution (#7302)
* fix: apply the session's Comet configs in map stages of jobs outside a SQL execution
On an executor, SQLConf.get reads the task's local properties, which
Spark fills with the session's configs only for jobs that run inside a
SQL execution. A job launched from a query's RDD (Dataset.rdd with AQE
off, QueryExecution.toRdd) runs its map stages outside one, and Spark's
SQLExecutionRDD re-applies the session's configs only in the final
stage. Comet reads its settings on the executor when it builds a native
plan, so those map stages ran with every spark.comet.* setting at its
default, including the memory pool and the configs passed to native.
Capture the session's configs on the driver where Comet builds the RDDs
and native shuffle that run native plans, and make them what SQLConf.get
returns on the task thread while the plan is built, as SQLExecutionRDD
does. Tasks inside a SQL execution are unchanged.
Closes #7301.
* refactor: capture only Comet configs once per shuffle and let configs Spark passed win
Capture only spark.comet.* keys, and apply them only when no conf is set
on the thread and the task got none of the session's Comet configs from
Spark, so SQLExecution.withSQLConfPropagated still takes effect. Carry
the native shuffle's one captured conf from its input RDD to the writer,
apply it inside the serialized-plan getCometIterator, and drop the test
workarounds this change makes redundant.
* fix: apply the session's Comet configs to shuffle reads and test each native plan site
A Comet shuffle read with no native plan above it in its stage, such as
one feeding a Spark operator in an intermediate stage, still read Comet
defaults. Capture the configs in CometShuffledBatchRDD and apply them in
compute and computeAsShuffleBlockIterator, which makes the wrap in
CometNativeShuffleInputRDD.compute redundant, so drop it. Make that RDD's
sqlConf required so each call site captures on the driver explicitly.
Replace the single test with one per site: the native shuffle writer, a
native plan in a map stage, the native limit, the native top-K, each
checking the memory pool every native plan resolves, and a shuffle read
under spark.comet.shuffle.readBufferSize=0.
* fix: apply the captured configs to the Celeborn frame size and capture DEBUG logs in tests
The native Celeborn writer read spark.comet.shuffle.rss.maxFrameBytes in
getWriter, before the writer applies the captured configs. Carry the
configs on NativeShuffleSpec, which getWriter can reach through the
dependency, and apply them to that read as well as in the writer, in
place of CometNativeShuffleInputRDD and its iterator.
Spark's LogAppender keeps INFO and above by default, so set its threshold
to DEBUG for the memory pool line the tests read.
---------
Co-authored-by: Andy Grove <[email protected]>1 parent 962db53 commit 15305af
15 files changed
Lines changed: 219 additions & 41 deletions
File tree
- spark/src
- main/scala/org/apache/spark/sql/comet
- execution/shuffle
- test/scala/org/apache
- comet
- exec
- vector
- spark/sql/comet
- execution/shuffle
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
| 96 | + | |
| 97 | + | |
96 | 98 | | |
97 | 99 | | |
98 | 100 | | |
| |||
103 | 105 | | |
104 | 106 | | |
105 | 107 | | |
106 | | - | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
107 | 112 | | |
108 | 113 | | |
109 | 114 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
| 75 | + | |
75 | 76 | | |
76 | 77 | | |
77 | 78 | | |
78 | 79 | | |
79 | 80 | | |
80 | 81 | | |
81 | 82 | | |
| 83 | + | |
82 | 84 | | |
83 | 85 | | |
84 | 86 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
155 | 155 | | |
156 | 156 | | |
157 | 157 | | |
| 158 | + | |
158 | 159 | | |
159 | 160 | | |
160 | 161 | | |
| |||
178 | 179 | | |
179 | 180 | | |
180 | 181 | | |
| 182 | + | |
181 | 183 | | |
182 | 184 | | |
183 | 185 | | |
| |||
207 | 209 | | |
208 | 210 | | |
209 | 211 | | |
| 212 | + | |
210 | 213 | | |
211 | 214 | | |
212 | 215 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
173 | 176 | | |
174 | | - | |
175 | | - | |
176 | | - | |
| 177 | + | |
177 | 178 | | |
178 | 179 | | |
179 | 180 | | |
| |||
189 | 190 | | |
190 | 191 | | |
191 | 192 | | |
192 | | - | |
| 193 | + | |
193 | 194 | | |
194 | 195 | | |
195 | 196 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
98 | | - | |
| 98 | + | |
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
| 48 | + | |
47 | 49 | | |
48 | 50 | | |
49 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
235 | 235 | | |
236 | 236 | | |
237 | 237 | | |
| 238 | + | |
238 | 239 | | |
239 | 240 | | |
240 | 241 | | |
| |||
968 | 969 | | |
969 | 970 | | |
970 | 971 | | |
971 | | - | |
| 972 | + | |
972 | 973 | | |
973 | 974 | | |
974 | 975 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| |||
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| 51 | + | |
| 52 | + | |
50 | 53 | | |
51 | 54 | | |
52 | 55 | | |
| |||
166 | 169 | | |
167 | 170 | | |
168 | 171 | | |
169 | | - | |
| 172 | + | |
170 | 173 | | |
171 | 174 | | |
172 | 175 | | |
| |||
180 | 183 | | |
181 | 184 | | |
182 | 185 | | |
183 | | - | |
184 | | - | |
185 | | - | |
186 | | - | |
187 | | - | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
188 | 192 | | |
189 | 193 | | |
190 | 194 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
810 | 810 | | |
811 | 811 | | |
812 | 812 | | |
| 813 | + | |
813 | 814 | | |
814 | 815 | | |
815 | 816 | | |
816 | 817 | | |
817 | 818 | | |
818 | 819 | | |
819 | 820 | | |
820 | | - | |
| 821 | + | |
| 822 | + | |
821 | 823 | | |
822 | 824 | | |
823 | 825 | | |
| |||
0 commit comments