Repository navigation
feat/cit ready port race - #79
Merged
Merged
Conversation
ahze
commented
Nov 10, 2026
ahze
commented
Member
- fix(appjail): run appjail with PAGER=cat
- fix(test): end the ready wait when the port opens
appjail logs read pages its output through $PAGER even when stdout is a pipe, and dbuild calls it through doas, which drops the caller's environment. The less it starts waits on a terminal nobody has, so the AppJail CIT sat for hours in the ready wait. Set PAGER=cat in appjail's environment for every call.
Images without cit.ready waited the full cit.wait for a log pattern that base-exec never prints, then passed on the port and health checks anyway: two minutes per backend on every CI job for about a third of the fleet. Race the pattern against a TCP connect on cit.port and report the new ready state "port" when the port wins; the pattern still wins when it matches first. The three poll loops now use a monotonic deadline instead of summing sleeps, so connect time counts. The timeout warning names the port, and only mentions s6 notification-fd when the repo has root/etc/services.d. Measured on stalwart:pkg, podman: 130 s to 5 s.
Passing PAGER in the subprocess environment only reaches doas, which drops it, so appjail logs read still started less and the AppJail CIT hung on saturn. Put env PAGER=cat between the privilege prefix and appjail instead; it works the same as root. Proven on an immich-ml AppJail CIT: no pager, port ready, health 200.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.