Update composite disk mtime when disk spec matches existing - #3142
Merged
Conversation
Elie-Kh
force-pushed
the
update_composite_mtime
branch
from
September 4, 2026 16:21
da7c225 to
e1f39e6
Compare
Databean
force-pushed
the
update_composite_mtime
branch
from
September 8, 2026 21:09
e1f39e6 to
4a8ac09
Compare
Databean
approved these changes
Sep 8, 2026
Databean
left a comment
Databean
left a comment
Member
There was a problem hiding this comment.
This change is failing on linters
/usr/local/google/home/schuffelen/.cache/bazel/_bazel_schuffelen/e5255ea4f0651a267b9880f9e2ad5869/sandbox/linux-sandbox/801/execroot/_main/cuttlefish/host/libs/image_aggregator/image_aggregator.cc:371:67: error: no header providing "errno" is directly included [misc-include-cleaner,-warnings-as-errors]
23 | << output_composite_path << "\": " << strerror(errno);
| ^
Elie-Kh
force-pushed
the
update_composite_mtime
branch
3 times, most recently
from
September 9, 2026 17:18
5ef4c7e to
ddb6a3f
Compare
Elie-Kh
enabled auto-merge
September 9, 2026 17:19
When CreateOrUpdateCompositeDisk determines that an existing composite disk already matches the target partition layout, it skips regenerating the disk file. However, if a component partition (such as persistent_vbmeta.img) was regenerated or touched during instance setup, the composite disk's modification time would remain older than that component. This causes subsequent assemble_cvd checks to falsely detect that a component was updated and fail with an mtime mismatch error. Update the modification time of output_composite_path using utimensat when the existing disk spec is retained, ensuring the composite disk mtime remains up to date. Bug: 554545294
Elie-Kh
force-pushed
the
update_composite_mtime
branch
from
September 9, 2026 19:57
ddb6a3f to
595cc10
Compare
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
3 participants
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.
When CreateOrUpdateCompositeDisk determines that an existing composite disk already matches the target partition layout, it skips regenerating the disk file. However, if a component partition (such as persistent_vbmeta.img) was regenerated or touched during instance setup, the composite disk's modification time would remain older than that component. This causes subsequent assemble_cvd checks to falsely detect that a component was updated and fail with an mtime mismatch error.
Update the modification time of output_composite_path using utimensat when the existing disk spec is retained, ensuring the composite disk mtime remains up to date.
Bug: 554545294