Repository navigation
tests: Cap oci-delta's bsdiff size in the switch-from-delta test - #2635
Merged
Merged
Conversation
This was referenced Nov 8, 2026
Contributor
|
This looks good to me (although the comment is perhaps overly verbose). Seems to fail in some unrelated CI thing though. |
On composefs UKI, plan-51-switch-from-delta can fail with oci-delta create "terminated by SIGKILL": bsdiff on the rebuilt ~120 MiB UKI (under the default 192 MiB cap) takes oci-delta to 2.3 GiB or more, and the kernel OOM-kills it in the 4G test VM. Capping bsdiff at 64 MiB sends the UKI through rollsums instead. Peak memory drops to about 130 MiB and the delta stays about the same size, so the test still applies a real binary delta. Generated-by: AI Signed-off-by: Joseph Marrero Corchado <jmarrero@redhat.com>
jmarrero-bot
force-pushed
the
bot/delta-test-memory
branch
from
November 9, 2026 19:55
555d9c2 to
631c9fa
Compare
Contributor
Author
|
Shortened the comment and the commit message (631c9fa). The earlier CI failure was plan-34-user-agent's VM never coming up for SSH, unrelated; plan-51-switch-from-delta passed in that run. |
This was referenced Nov 10, 2026
jmarrero
enabled auto-merge (rebase)
November 11, 2026 12:19
cgwalters
disabled auto-merge
November 13, 2026 22:38
cgwalters
enabled auto-merge (rebase)
November 13, 2026 22:38
cgwalters
approved these changes
Nov 13, 2026
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.
plan-51-switch-from-delta can fail on composefs UKI with
oci-delta create"terminated by SIGKILL" (seen on #2623). The guest kernel OOM-kills oci-delta in the 4G test VM, which has no swap: the rebuilt UKI (~122 MiB) is under oci-delta's default 192 MiB bsdiff limit, and tar-diff's bsdiff needs ~16 bytes per byte of the old file. Capping bsdiff at 64 MiB in the test makes oci-delta use rollsums for the UKI, with a delta of about the same size.Testing, on a 16-core RHEL 10 devspace, image built like CI's fedora-44 composefs xfs systemd uki unsealed job, plan in bcvk's default 4G/2 vCPU VM:
--max-bsdiff-size 64at 100-140 MiB, in ~72 s instead of ~170 s, and the delta is 3.35 MB instead of 3.42 MB.--jobs 1doesn't lower the peak.GOGC=200in the test environment, main failed 2/2 exactly like CI and this branch passed 2/2. Even withGOGC=offoci-delta stays at 1.07 GiB with the cap.Measurements and run details: https://gist.github.com/jmarrero-bot/cef85960bc80160278b2440ebb86d112
Related: #2623
The
Signed-off-by: Joseph Marrero Corchado <jmarrero@redhat.com>on these commits was added on jmarrero's approval of the review draft: jmarrero-forge#13 (comment)Generated-by: https://github.com/jmarrero-bot#llms