From 41c937a7b55d0258e36577dd176bfe08b317b527 Mon Sep 17 00:00:00 2001 From: Noah Gift Date: Mon, 19 Oct 2026 12:36:14 +0200 Subject: [PATCH 1/2] ci: cap section container threads at 2 (CARGO_BUILD_JOBS, RAYON_NUM_THREADS, nextest, libtest) (Refs #5746) Operator P1b: cores / jobs per host. intel 32 cores, 14 busy workers, load/cores 6.1 vs gate 1.2; sections passed CARGO_BUILD_JOBS=8. Co-Authored-By: Claude Sonnet 5.5 --- ci/sections.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ci/sections.yml b/ci/sections.yml index e2bf1475da..4d92bf0188 100644 --- a/ci/sections.yml +++ b/ci/sections.yml @@ -529,7 +529,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ -e SHARD -e SHARDS \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ @@ -563,7 +563,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ "$IMAGE" \ @@ -595,7 +595,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ "$IMAGE" \ bash -c 'cargo test -p aprender-compute --lib 2>&1 | tee /tmp/compute-test.log; grep -Eq "test result: ok\. [1-9][0-9]* passed" /tmp/compute-test.log && ! grep -q "test result: FAILED" /tmp/compute-test.log' - name: Integration tests @@ -667,7 +667,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ -e SHARD -e SHARDS \ "$IMAGE" \ bash scripts/ci_run_explicit_test_commands.sh --run ci/explicit-test-commands.d --shard "${SHARD}/${SHARDS}" @@ -700,7 +700,7 @@ jobs: -e RUSTC_WRAPPER=/usr/local/cargo/bin/sccache \ -e SCCACHE_DIR=/sccache \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ "$IMAGE" \ @@ -769,7 +769,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ -e SHARD -e SHARDS \ "$IMAGE" \ cargo build --examples --workspace --keep-going @@ -838,7 +838,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ -e CARGO_TERM_COLOR=never \ @@ -936,7 +936,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ -e CARGO_TERM_COLOR=never \ @@ -1009,7 +1009,7 @@ jobs: -e RUSTC_WRAPPER=/usr/local/cargo/bin/sccache \ -e SCCACHE_DIR=/sccache \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ -e TREE="$tree" -e EXPR="$EXPR" \ @@ -1049,7 +1049,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ -e CARGO_TERM_COLOR=never \ @@ -2447,7 +2447,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=8 \ + -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ -e CARGO_TERM_COLOR=never \ "${DR_ENV[@]}" \ "$IMAGE" "$@" From 9120c3e26d05ae833c8f482e0a5908be77e6dd8b Mon Sep 17 00:00:00 2001 From: Noah Gift Date: Mon, 19 Oct 2026 12:37:39 +0200 Subject: [PATCH 2/2] ci: thread cap 4, not 2 (operator amendment 1: 8 slots x 4 threads) (Refs #5746) Co-Authored-By: Claude Sonnet 5.5 --- ci/sections.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ci/sections.yml b/ci/sections.yml index 4d92bf0188..f22e50b78f 100644 --- a/ci/sections.yml +++ b/ci/sections.yml @@ -529,7 +529,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ -e SHARD -e SHARDS \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ @@ -563,7 +563,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ "$IMAGE" \ @@ -595,7 +595,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ "$IMAGE" \ bash -c 'cargo test -p aprender-compute --lib 2>&1 | tee /tmp/compute-test.log; grep -Eq "test result: ok\. [1-9][0-9]* passed" /tmp/compute-test.log && ! grep -q "test result: FAILED" /tmp/compute-test.log' - name: Integration tests @@ -667,7 +667,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ -e SHARD -e SHARDS \ "$IMAGE" \ bash scripts/ci_run_explicit_test_commands.sh --run ci/explicit-test-commands.d --shard "${SHARD}/${SHARDS}" @@ -700,7 +700,7 @@ jobs: -e RUSTC_WRAPPER=/usr/local/cargo/bin/sccache \ -e SCCACHE_DIR=/sccache \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ "$IMAGE" \ @@ -769,7 +769,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ -e SHARD -e SHARDS \ "$IMAGE" \ cargo build --examples --workspace --keep-going @@ -838,7 +838,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ -e CARGO_TERM_COLOR=never \ @@ -936,7 +936,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ -e CARGO_TERM_COLOR=never \ @@ -1009,7 +1009,7 @@ jobs: -e RUSTC_WRAPPER=/usr/local/cargo/bin/sccache \ -e SCCACHE_DIR=/sccache \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ -e TREE="$tree" -e EXPR="$EXPR" \ @@ -1049,7 +1049,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ -e CARGO_PROFILE_TEST_DEBUG=line-tables-only \ -e CARGO_PROFILE_DEV_DEBUG=line-tables-only \ -e CARGO_TERM_COLOR=never \ @@ -2447,7 +2447,7 @@ jobs: -e SCCACHE_DIR=/sccache \ -e SCCACHE_CACHE_SIZE=50G \ -e CARGO_INCREMENTAL=0 \ - -e CARGO_BUILD_JOBS=2 -e RAYON_NUM_THREADS=2 -e NEXTEST_TEST_THREADS=2 -e RUST_TEST_THREADS=2 \ + -e CARGO_BUILD_JOBS=4 -e RAYON_NUM_THREADS=4 -e NEXTEST_TEST_THREADS=4 -e RUST_TEST_THREADS=4 \ -e CARGO_TERM_COLOR=never \ "${DR_ENV[@]}" \ "$IMAGE" "$@"