Skip to content

assemble_cvd: Skip rebuilding OS composite disk on snapshot restore - #3143

Open
Elie-Kh wants to merge 1 commit into
google:mainfrom
Elie-Kh:skip_rebuilding_os_disk_on_restore
Open

assemble_cvd: Skip rebuilding OS composite disk on snapshot restore#3143
Elie-Kh wants to merge 1 commit into
google:mainfrom
Elie-Kh:skip_rebuilding_os_disk_on_restore

Conversation

@Elie-Kh

@Elie-Kh Elie-Kh commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

When restoring from a snapshot, the base images and instance disks have already been restored from the snapshot directory by RestoreHostFiles(). Checking filesystem timestamps to determine whether to rebuild composite disks during snapshot restore can lead to creating_os_disk becoming true, which causes assemble_cvd to abort with 'Restoring from snapshot requires not creating OS disks'.

Only evaluate WillRebuildCompositeDisk() and set creating_os_disk when snapshot_path is empty.

Bug: 554545294

When restoring from a snapshot, the base images and instance disks
have already been restored from the snapshot directory by
RestoreHostFiles(). Checking filesystem timestamps to determine whether
to rebuild composite disks during snapshot restore can lead to
creating_os_disk becoming true, which causes assemble_cvd to abort
with 'Restoring from snapshot requires not creating OS disks'.

Only evaluate WillRebuildCompositeDisk() and set creating_os_disk when
snapshot_path is empty.

Bug: 554545294
@Elie-Kh
Elie-Kh force-pushed the skip_rebuilding_os_disk_on_restore branch from 7d8cdd9 to c148b7d Compare September 4, 2026 16:21
@Databean Databean added the kokoro:run Run e2e tests. label Sep 5, 2026
@GoogleCuttlefishTesterBot GoogleCuttlefishTesterBot removed the kokoro:run Run e2e tests. label Sep 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants