X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/8fed77f7fce8dd2d4793e9300b8aee904b00bdc3..1fa75c4ca399555f63fa744ba8e91495ea091135:/image_creator/disk.py diff --git a/image_creator/disk.py b/image_creator/disk.py index c367efd..f8794ba 100644 --- a/image_creator/disk.py +++ b/image_creator/disk.py @@ -33,7 +33,10 @@ from image_creator.util import get_command from image_creator.util import FatalError +from image_creator.util import try_fail_repeat from image_creator.gpt import GPTPartitionTable +from image_creator.bundle_volume import BundleVolume + import stat import os import tempfile @@ -41,7 +44,6 @@ import uuid import re import sys import guestfs -import time from sendfile import sendfile @@ -61,11 +63,13 @@ class Disk(object): def __init__(self, source, output): """Create a new Disk instance out of a source media. The source - media can be an image file, a block device or a directory.""" + media can be an image file, a block device or a directory. + """ self._cleanup_jobs = [] self._devices = [] self.source = source self.out = output + self.meta = {} def _add_cleanup(self, job, *args): self._cleanup_jobs.append((job, args)) @@ -73,24 +77,37 @@ class Disk(object): def _losetup(self, fname): loop = losetup('-f', '--show', fname) loop = loop.strip() # remove the new-line char - self._add_cleanup(losetup, '-d', loop) + self._add_cleanup(try_fail_repeat, losetup, '-d', loop) return loop def _dir_to_disk(self): - raise FatalError("Using a directory as media source is not supported " - "yet!") + if self.source == '/': + bundle = BundleVolume(self.out, self.meta) + image = '/var/tmp/%s.diskdump' % uuid.uuid4().hex + + def check_unlink(path): + if os.path.exists(path): + os.unlink(path) + + self._add_cleanup(check_unlink, image) + bundle.create_image(image) + return self._losetup(image) + raise FatalError("Using a directory as media source is supported") def cleanup(self): """Cleanup internal data. This needs to be called before the program ends. """ - while len(self._devices): - device = self._devices.pop() - device.destroy() - - while len(self._cleanup_jobs): - job, args = self._cleanup_jobs.pop() - job(*args) + try: + while len(self._devices): + device = self._devices.pop() + device.destroy() + finally: + # Make sure those are executed even if one of the device.destroy + # methods throws exeptions. + while len(self._cleanup_jobs): + job, args = self._cleanup_jobs.pop() + job(*args) def snapshot(self): """Creates a snapshot of the original source media of the Disk @@ -102,7 +119,7 @@ class Disk(object): mode = os.stat(self.source).st_mode if stat.S_ISDIR(mode): self.out.success('looks like a directory') - return self._losetup(self._dir_to_disk()) + return self._dir_to_disk() elif stat.S_ISREG(mode): self.out.success('looks like an image file') sourcedev = self._losetup(self.source) @@ -128,11 +145,7 @@ class Disk(object): os.write(tablefd, "0 %d snapshot %s %s n 8" % (int(size), sourcedev, cowdev)) dmsetup('create', snapshot, table) - self._add_cleanup(dmsetup, 'remove', snapshot) - # Sometimes dmsetup remove fails with Device or resource busy, - # although everything is cleaned up and the snapshot is not - # used by anyone. Add a 2 seconds delay to be on the safe side. - self._add_cleanup(time.sleep, 2) + self._add_cleanup(try_fail_repeat, dmsetup, 'remove', snapshot) finally: os.unlink(table) @@ -160,16 +173,16 @@ class DiskDevice(object): as created by the device-mapper. """ - def __init__(self, device, output, bootable=True): + def __init__(self, device, output, bootable=True, meta={}): """Create a new DiskDevice.""" self.real_device = device self.out = output self.bootable = bootable + self.meta = meta self.progress_bar = None self.guestfs_device = None self.size = 0 - self.meta = {} self.g = guestfs.GuestFS() self.g.add_drive_opts(self.real_device, readonly=0) @@ -195,17 +208,20 @@ class DiskDevice(object): def enable(self): """Enable a newly created DiskDevice""" - self.progressbar = self.out.Progress(100, "Launching helper VM", - "percent") - eh = self.g.set_event_callback(self.progress_callback, - guestfs.EVENT_PROGRESS) + + self.out.output('Launching helper VM (may take a while) ...', False) + # self.progressbar = self.out.Progress(100, "Launching helper VM", + # "percent") + # eh = self.g.set_event_callback(self.progress_callback, + # guestfs.EVENT_PROGRESS) self.g.launch() self.guestfs_enabled = True - self.g.delete_event_callback(eh) - self.progressbar.success('done') - self.progressbar = None + # self.g.delete_event_callback(eh) + # self.progressbar.success('done') + # self.progressbar = None + self.out.success('done') - self.out.output('Inspecting Operating System...', False) + self.out.output('Inspecting Operating System ...', False) roots = self.g.inspect_os() if len(roots) == 0: raise FatalError("No operating system found") @@ -225,24 +241,27 @@ class DiskDevice(object): def destroy(self): """Destroy this DiskDevice instance.""" - if self.guestfs_enabled: - self.g.umount_all() - self.g.sync() - - # Close the guestfs handler if open - self.g.close() - - def progress_callback(self, ev, eh, buf, array): - position = array[2] - total = array[3] + # In new guestfs versions, there is a handy shutdown method for this + try: + if self.guestfs_enabled: + self.g.umount_all() + self.g.sync() + finally: + # Close the guestfs handler if open + self.g.close() - self.progressbar.goto((position * 100) // total) +# def progress_callback(self, ev, eh, buf, array): +# position = array[2] +# total = array[3] +# +# self.progressbar.goto((position * 100) // total) def mount(self, readonly=False): """Mount all disk partitions in a correct order.""" mount = self.g.mount_ro if readonly else self.g.mount - self.out.output("Mounting image...", False) + msg = " read-only" if readonly else "" + self.out.output("Mounting the media%s..." % msg, False) mps = self.g.inspect_get_mountpoints(self.root) # Sort the keys to mount the fs in a correct order. @@ -437,7 +456,8 @@ class DiskDevice(object): progressbar.next() while left > 0: length = min(left, blocksize) - sent = sendfile(dst.fileno(), src.fileno(), offset, length) + _, sent = sendfile(dst.fileno(), src.fileno(), offset, + length) offset += sent left -= sent progressbar.goto((size - left) // MB)