almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Make no-virt generated images sparser

Browse Source 
At the end of disk image installs, use fstrim on the generated filesystem to
discard any blocks that were allocated during the install and are now unused.
This will allow tools such as qemu-img to create images that do not include
deleted data.

For raw disk images that do not go through qemu-img, use fallocate --dig-holes
to create sparse holes in place of the unused blocks.
This commit is contained in:
David Shea 2018-10-04 13:01:59 -04:00 committed by Brian C. Lane
parent fb1dfc9488
commit 955631b872
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pylorax/installer.py
View File

@ -385,17 +385,24 @@ def novirt_install(opts, disk_img, disk_size):
setfiles_args = ["-e", "/proc", "-e", "/sys", "-e", "/dev", setfiles_args = ["-e", "/proc", "-e", "/sys", "-e", "/dev",
"/etc/selinux/targeted/contexts/files/file_contexts", "/"] "/etc/selinux/targeted/contexts/files/file_contexts", "/"]
if "--dirinstall" in args:
# setfiles may not be available, warn instead of fail # setfiles may not be available, warn instead of fail
try: try:
if "--dirinstall" in args:
execWithRedirect("setfiles", setfiles_args, root=dirinstall_path) execWithRedirect("setfiles", setfiles_args, root=dirinstall_path)
except (subprocess.CalledProcessError, OSError) as e:
log.warning("Running setfiles on install tree failed: %s", str(e))
else: else:
with PartitionMount(disk_img) as img_mount: with PartitionMount(disk_img) as img_mount:
if img_mount and img_mount.mount_dir: if img_mount and img_mount.mount_dir:
try:
execWithRedirect("setfiles", setfiles_args, root=img_mount.mount_dir) execWithRedirect("setfiles", setfiles_args, root=img_mount.mount_dir)
except (subprocess.CalledProcessError, OSError) as e: except (subprocess.CalledProcessError, OSError) as e:
log.warning("Running setfiles on install tree failed: %s", str(e)) log.warning("Running setfiles on install tree failed: %s", str(e))
# For image installs, run fstrim to discard unused blocks. This way
# unused blocks do not need to be allocated for sparse image types
execWithRedirect("fstrim", [img_mount.mount_dir])
except (subprocess.CalledProcessError, OSError) as e: except (subprocess.CalledProcessError, OSError) as e:
log.error("Running anaconda failed: %s", e) log.error("Running anaconda failed: %s", e)
raise InstallError("novirt_install failed") raise InstallError("novirt_install failed")
@ -481,6 +488,9 @@ def novirt_install(opts, disk_img, disk_size):
if rc: if rc:
raise InstallError("novirt_install mktar failed: rc=%s" % rc) raise InstallError("novirt_install mktar failed: rc=%s" % rc)
else:
# For raw disk images, use fallocate to deallocate unused space
execWithRedirect("fallocate", ["--dig-holes", disk_img], raise_err=True)
def virt_install(opts, install_log, disk_img, disk_size): def virt_install(opts, install_log, disk_img, disk_size):