From 6deb909587e4d4e205d9221217df12c7ee15b918 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Thu, 22 Oct 2026 01:23:41 -0700 Subject: [PATCH 1/3] chore(quest): claim quest/m1/ci-housekeeping.md Quest-Claim: 7d3477334f0bd958 From 22ba550a20dc304478f0383cc30021975954a349 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Thu, 22 Oct 2026 01:27:50 -0700 Subject: [PATCH 2/3] test(cli): isolate the late-stats readiness log filter Co-Authored-By: GPT-6 --- quest/m1/ci-housekeeping.md | 18 ++++++++++++++---- rs/moq-cli/tests/integration/stats.rs | 2 ++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/quest/m1/ci-housekeeping.md b/quest/m1/ci-housekeeping.md index ae1ea6c4952..f4348fb5213 100644 --- a/quest/m1/ci-housekeeping.md +++ b/quest/m1/ci-housekeeping.md @@ -18,10 +18,20 @@ ("stitching export exited") and `stats::a_late_sink_reads_the_final_stats` ("the import exited before its input ended"). nextest stopped after - 1,870 of 9,398 tests: 1,868 passed, two failed. Investigate these failures - before enabling the setting; don't mask them with retries or longer - timeouts. [moq-dev/moq#6113](https://github.com/moq-dev/moq/pull/6113) - already edits the redundant-importer tests. + 1,870 of 9,398 tests: 1,868 passed, two failed. + + The stats failure reproduced on main `005eca04aa` with inherited + `RUST_LOG=warn`: its INFO readiness message was suppressed, and the test + reported failure when the importer finished its normal 10 s retention. + The child now explicitly sets `RUST_LOG=info`, like the other CLI fixtures + that wait for log messages. All four stats integration tests pass with + inherited `RUST_LOG=off`, including the late sink in 140 ms; production + behavior and timeouts are unchanged. + + [moq-dev/moq#6113](https://github.com/moq-dev/moq/pull/6113) still owns the + redundant-importer fix. Account for that prerequisite, then complete the + loaded validation before enabling 24 threads. No retry, assertion, timeout, + or concurrency setting changes in this checkpoint. - **Actionlint.** [rhysd/actionlint#661](https://github.com/rhysd/actionlint/pull/661) is merged but unreleased. The dev shell still has actionlint 1.7.12. [moq-dev/moq#6180](https://github.com/moq-dev/moq/pull/6180) added the diff --git a/rs/moq-cli/tests/integration/stats.rs b/rs/moq-cli/tests/integration/stats.rs index acbd1ae7b5d..a2ef7bdce31 100644 --- a/rs/moq-cli/tests/integration/stats.rs +++ b/rs/moq-cli/tests/integration/stats.rs @@ -344,6 +344,8 @@ async fn a_late_sink_reads_the_final_stats() { let (expected, health) = written(CLIP); let mut import = moq(&relay, "demo", &["import", "--stats", "--max-age", "10s", "ts"]) + // Readiness is an INFO event, independent of the invoking shell's filter. + .env("RUST_LOG", "info") .stdin(Stdio::piped()) .stderr(Stdio::piped()) .spawn() From 8620179ccce9e930069022919da1e4033881b2a2 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Thu, 22 Oct 2026 05:03:29 -0700 Subject: [PATCH 3/3] ci: run merge queue tests with 24 workers Co-Authored-By: GPT-6 --- .github/workflows/check.yml | 3 +++ quest/m1/ci-housekeeping.md | 41 ++++++++----------------------------- 2 files changed, 11 insertions(+), 33 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4b133a66d34..5a6f7885604 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -81,6 +81,9 @@ jobs: if: steps.scope.outputs.needed == 'true' run: | rm -rf target/cargo-timings + if [[ "$GITHUB_EVENT_NAME" == merge_group ]]; then + export NEXTEST_TEST_THREADS=24 + fi nix develop --command just ci "$CI_BASE" env: CI_BASE: ${{ github.base_ref == 'release' && '--all' || github.event.merge_group.base_sha }} diff --git a/quest/m1/ci-housekeeping.md b/quest/m1/ci-housekeeping.md index f4348fb5213..89f66216c9d 100644 --- a/quest/m1/ci-housekeeping.md +++ b/quest/m1/ci-housekeeping.md @@ -1,42 +1,17 @@ -# [XS] Finish CI housekeeping +# [XS] Remove the actionlint queue-key workaround ## Goal -- The merge queue's nextest runs with `NEXTEST_TEST_THREADS=24` after loaded - validation passes. -- `.github/actionlint.yaml` drops its ignore for the `queue` key once an - actionlint release after 1.7.12 is in the dev shell. +`.github/actionlint.yaml` drops its ignore for the `queue` key once an +actionlint release after 1.7.12 is in the dev shell. ## Plan -- **Threads.** Recommended in - [moq-dev/moq#6174](https://github.com/moq-dev/moq/pull/6174): the suite - spends most slots waiting. Run a few loaded `just check --all` passes at - 24 before setting it for the queue job only. A full Rust test selection - with 24 workers pinned to eight CPUs failed - `export::redundant_importers_switch_to_the_survivor_and_back_on_lite_07` - ("stitching export exited") and - `stats::a_late_sink_reads_the_final_stats` - ("the import exited before its input ended"). nextest stopped after - 1,870 of 9,398 tests: 1,868 passed, two failed. - - The stats failure reproduced on main `005eca04aa` with inherited - `RUST_LOG=warn`: its INFO readiness message was suppressed, and the test - reported failure when the importer finished its normal 10 s retention. - The child now explicitly sets `RUST_LOG=info`, like the other CLI fixtures - that wait for log messages. All four stats integration tests pass with - inherited `RUST_LOG=off`, including the late sink in 140 ms; production - behavior and timeouts are unchanged. - - [moq-dev/moq#6113](https://github.com/moq-dev/moq/pull/6113) still owns the - redundant-importer fix. Account for that prerequisite, then complete the - loaded validation before enabling 24 threads. No retry, assertion, timeout, - or concurrency setting changes in this checkpoint. -- **Actionlint.** [rhysd/actionlint#661](https://github.com/rhysd/actionlint/pull/661) - is merged but unreleased. The dev shell still has actionlint 1.7.12. - [moq-dev/moq#6180](https://github.com/moq-dev/moq/pull/6180) added the - ignore for the three Pages publishing workflows; remove it when the - release reaches nixpkgs and `just gh check` accepts `queue: max`. +[rhysd/actionlint#661](https://github.com/rhysd/actionlint/pull/661) is merged +but unreleased. The dev shell still has actionlint 1.7.12. +[moq-dev/moq#6180](https://github.com/moq-dev/moq/pull/6180) added the ignore +for the three Pages publishing workflows; remove it when the release reaches +nixpkgs and `just gh check` accepts `queue: max`. Public API: none. Wire: none.