Commit 734bfe8
committed
fix(ci): make the Doris 4.0.3 shared container healthy on CI runners
After bumping the shared CI container from doris-all-in-one-2.1.0 to 4.0.3-all-slim
(so CI matches the fixture image), the doris tests began timing out the 1h job cap.
Root cause, found by reproducing the container locally: 4.0.3's start_be.sh
hard-`exit 1`s unless vm.max_map_count >= 2000000 (it also gates on swap and
ulimit). The 2.1.0 image had no such gate, which is exactly why it passed in 13min
and 4.0.3 did not. On the runner's low default the BE exits on start; its death
ends the entrypoint's `wait $child_pid`, so the container exits 0 and never reports
healthy — forcing every test onto the slow per-test self-boot path (480s nextest
timeout x 4 retries).
- Raise vm.max_map_count to 2000000 on the runner before launch (inherited by all
containers) and pass SKIP_CHECK_ULIMIT=true to bypass the swap/ulimit gates
without swapoff'ing the runner. Verified locally: BE reaches alive=true.
- Self-boot fixture sets SKIP_CHECK_ULIMIT=true too, so the fallback path and
local Linux dev aren't blocked by the same gates.
- Cap FE heap to 2GB and BE mem_limit to 4GB: the container boots beside the cargo
build on a 16GB runner, and 4.0.3 otherwise sizes for a dedicated host (8GB FE
heap + ~90%-of-RAM BE), so bounding it keeps room for rustc.
- Make the shared-container wait non-fatal and dump docker logs/inspect on the
unhealthy path, so a launch failure degrades to self-boot instead of aborting
the step.
Also rustfmt the sqlx AssertSqlSafe call sites introduced by the sqlx 0.9 migration
in the preceding master merge.
Verified in CI: shared container reports healthy and test-1/test-2 pass (~13min).1 parent e66c62b commit 734bfe8
2 files changed
Lines changed: 48 additions & 12 deletions
File tree
- .github/actions/rust/pre-merge
- core/integration/tests/connectors/fixtures/doris
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
229 | 229 | | |
230 | 230 | | |
231 | 231 | | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
232 | 247 | | |
233 | 248 | | |
234 | | - | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
235 | 252 | | |
236 | 253 | | |
237 | 254 | | |
| |||
296 | 313 | | |
297 | 314 | | |
298 | 315 | | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
299 | 328 | | |
300 | 329 | | |
301 | 330 | | |
| |||
Lines changed: 18 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
212 | 212 | | |
213 | 213 | | |
214 | 214 | | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
215 | 222 | | |
216 | 223 | | |
217 | 224 | | |
| |||
357 | 364 | | |
358 | 365 | | |
359 | 366 | | |
360 | | - | |
361 | | - | |
362 | | - | |
363 | | - | |
364 | | - | |
365 | | - | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
366 | 373 | | |
367 | 374 | | |
368 | 375 | | |
| |||
457 | 464 | | |
458 | 465 | | |
459 | 466 | | |
460 | | - | |
461 | | - | |
462 | | - | |
463 | | - | |
464 | | - | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
465 | 472 | | |
466 | 473 | | |
467 | 474 | | |
| |||
0 commit comments