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

storage/reflink: _cleanup() -> _remove_incomplete_files()

Browse Source 
"cleanup" sounds related to the concept of a volume being "dirty" - but
it's unrelated. Rename it for clarity.
This commit is contained in:
Rusty Bird 2019-12-03 18:21:55 +00:00
parent d7478d128b
commit 87081d6ee3
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes/storage/reflink.py
View File

@ -179,14 +179,14 @@ class ReflinkVolume(qubes.storage.Volume):
oldest to newest; remove empty VM directory. 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._cleanup() self._remove_incomplete_files()
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)) _remove_empty_dir(os.path.dirname(self._path_dirty))
return self return self
def _cleanup(self): def _remove_incomplete_files(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,7 +205,7 @@ class ReflinkVolume(qubes.storage.Volume):
@_coroutinized @_coroutinized
@_locked @_locked
def start(self): def start(self):
self._cleanup() self._remove_incomplete_files()
if self.is_dirty(): # implies self.save_on_stop if self.is_dirty(): # implies self.save_on_stop
return self return self
if self.snap_on_start: if self.snap_on_start: