Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/316'

Browse Source 
* origin/pr/316:
  storage/reflink: trivial style tweaks
  storage/reflink: comment on _get_size() use in start()
  storage/reflink: don't bother using _get_size() in create()
  storage/reflink: delete all images at beginning of create()
  storage/reflink: get VM dir from less arbitrary-looking path
  storage/reflink: factor out _remove_all_images()
  storage/reflink: _remove_incomplete_{files -> images}()
  storage/reflink: omit redundant comment
This commit is contained in:
Marek Marczykowski-Górecki 2020-02-06 23:29:08 +01:00
commit f59fd3d474
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
qubes/storage/reflink.py
View File

@ -154,8 +154,9 @@ class ReflinkVolume(qubes.storage.Volume):
@_coroutinized @_coroutinized
@_locked @_locked
def create(self): def create(self):
self._remove_all_images()
if self.save_on_stop and not self.snap_on_start: if self.save_on_stop and not self.snap_on_start:
_create_sparse_file(self._path_clean, self._get_size()) _create_sparse_file(self._path_clean, self._size)
return self return self
@_coroutinized @_coroutinized
@ -175,18 +176,18 @@ class ReflinkVolume(qubes.storage.Volume):
@_coroutinized @_coroutinized
@_locked @_locked
def remove(self): def remove(self):
''' Drop volume object from pool; remove volume images from
oldest to newest; remove empty VM directory.
'''
self.pool._volumes.pop(self, None) # pylint: disable=protected-access self.pool._volumes.pop(self, None) # pylint: disable=protected-access
self._remove_incomplete_files() self._remove_all_images()
_remove_empty_dir(os.path.dirname(self._path_vid))
return self
def _remove_all_images(self):
self._remove_incomplete_images()
self._prune_revisions(keep=0) self._prune_revisions(keep=0)
_remove_file(self._path_clean) _remove_file(self._path_clean)
_remove_file(self._path_dirty) _remove_file(self._path_dirty)
_remove_empty_dir(os.path.dirname(self._path_dirty))
return self
def _remove_incomplete_files(self): def _remove_incomplete_images(self):
for tmp in glob.iglob(glob.escape(self._path_vid) + '*.img*~*'): for tmp in glob.iglob(glob.escape(self._path_vid) + '*.img*~*'):
_remove_file(tmp) _remove_file(tmp)
_remove_file(self._path_import) _remove_file(self._path_import)
@ -205,16 +206,18 @@ class ReflinkVolume(qubes.storage.Volume):
@_coroutinized @_coroutinized
@_locked @_locked
def start(self): def start(self):
self._remove_incomplete_files() self._remove_incomplete_images()
if self.is_dirty(): # implies self.save_on_stop if not self.is_dirty():
return self if self.snap_on_start:
if self.snap_on_start: # pylint: disable=protected-access
# pylint: disable=protected-access _copy_file(self.source._path_clean, self._path_clean)
_copy_file(self.source._path_clean, self._path_clean) if self.snap_on_start or self.save_on_stop:
if self.snap_on_start or self.save_on_stop: _copy_file(self._path_clean, self._path_dirty)
_copy_file(self._path_clean, self._path_dirty) else:
else: # Preferably use the size of a leftover image, in case
_create_sparse_file(self._path_dirty, self._get_size()) # the volume was previously resized - but then a crash
# prevented qubes.xml serialization of the new size.
_create_sparse_file(self._path_dirty, self._get_size())
return self return self
@_coroutinized @_coroutinized
@ -305,14 +308,13 @@ class ReflinkVolume(qubes.storage.Volume):
@_coroutinized @_coroutinized
@_locked @_locked
def import_volume(self, src_volume): def import_volume(self, src_volume):
if not self.save_on_stop: if self.save_on_stop:
return self try:
try: success = False
success = False _copy_file(src_volume.export(), self._path_import)
_copy_file(src_volume.export(), self._path_import) success = True
success = True finally:
finally: self._import_data_end(success)
self._import_data_end(success)
return self return self
def _path_revision(self, number, timestamp=None): def _path_revision(self, number, timestamp=None):