Repository navigation
Commit 1c7a1ac
committed
[fix](fe) Honor query timeout while waiting for the first split
### What problem does this PR solve?
Issue Number: N/A
Related PR: #69683
Problem Summary: Enabling Batch Mode for a single selected partition makes MaxCompute read-session creation asynchronous. The first split is not available until buildBatchReadSession completes, but SplitAssignment.init used a fixed 30-second planning timeout. A valid 40-second session creation could therefore fail even when the connector read timeout is 120 seconds and the query timeout is 900 seconds. Use the effective query timeout as the first-split wait bound, and measure the deadline with monotonic time. Add tests for delayed production within the caller deadline and timeout before any split.
### Release note
External scans no longer fail after a fixed 30-second first-split wait when the query timeout permits longer planning.
### Check List (For Author)
- Test: run-fe-ut.sh ran SplitAssignmentTest (22 passed) and SplitProducerTest (18 passed) with JDK 17; FE Checkstyle passed. A temporary test-only Maven wrapper skipped regeneration inside Maven because the host Xcode license blocks system make; generated sources were built by the standard script using Homebrew gmake.
- Behavior changed: Yes. The first-split planning wait follows the effective query timeout.
- Does this need documentation: No.1 parent fdce9a4 commit 1c7a1ac
4 files changed
Lines changed: 31 additions & 21 deletions
File tree
- fe/fe-core/src
- main/java/org/apache/doris/datasource
- scan
- split
- test/java/org/apache/doris/datasource/split
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
418 | 418 | | |
419 | 419 | | |
420 | 420 | | |
421 | | - | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
422 | 424 | | |
423 | 425 | | |
424 | 426 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
193 | 193 | | |
194 | 194 | | |
195 | 195 | | |
196 | | - | |
| 196 | + | |
| 197 | + | |
197 | 198 | | |
| 199 | + | |
198 | 200 | | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | 201 | | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
203 | 207 | | |
204 | | - | |
| 208 | + | |
| 209 | + | |
205 | 210 | | |
| 211 | + | |
206 | 212 | | |
207 | 213 | | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | | - | |
212 | | - | |
213 | 214 | | |
214 | 215 | | |
215 | 216 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
106 | | - | |
| 106 | + | |
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
| |||
178 | 178 | | |
179 | 179 | | |
180 | 180 | | |
181 | | - | |
| 181 | + | |
182 | 182 | | |
183 | 183 | | |
184 | 184 | | |
| |||
200 | 200 | | |
201 | 201 | | |
202 | 202 | | |
203 | | - | |
| 203 | + | |
204 | 204 | | |
205 | 205 | | |
206 | 206 | | |
| |||
214 | 214 | | |
215 | 215 | | |
216 | 216 | | |
217 | | - | |
| 217 | + | |
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
| |||
224 | 224 | | |
225 | 225 | | |
226 | 226 | | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
227 | 234 | | |
228 | 235 | | |
229 | 236 | | |
230 | 237 | | |
231 | 238 | | |
232 | 239 | | |
233 | | - | |
| 240 | + | |
234 | 241 | | |
235 | 242 | | |
236 | 243 | | |
| |||
463 | 470 | | |
464 | 471 | | |
465 | 472 | | |
466 | | - | |
| 473 | + | |
467 | 474 | | |
468 | 475 | | |
469 | 476 | | |
| |||
481 | 488 | | |
482 | 489 | | |
483 | 490 | | |
484 | | - | |
| 491 | + | |
485 | 492 | | |
486 | 493 | | |
487 | 494 | | |
| |||
490 | 497 | | |
491 | 498 | | |
492 | 499 | | |
493 | | - | |
| 500 | + | |
494 | 501 | | |
495 | 502 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
253 | 253 | | |
254 | 254 | | |
255 | 255 | | |
256 | | - | |
257 | | - | |
| 256 | + | |
| 257 | + | |
258 | 258 | | |
259 | 259 | | |
260 | 260 | | |
| |||
0 commit comments