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

storage/reflink: unblock import_data() and import_data_end()

Browse Source
This commit is contained in:
Rusty Bird 2018-10-29 20:21:39 +00:00
parent 114a9db09a
commit 425d993769
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubes/storage/reflink.py
View File

@ -279,6 +279,7 @@ class ReflinkVolume(qubes.storage.Volume):
'Cannot export: {} is not save_on_stop'.format(self.vid)) 'Cannot export: {} is not save_on_stop'.format(self.vid))
return self._path_clean return self._path_clean
@_unblock
def import_data(self): def import_data(self):
if not self.save_on_stop: if not self.save_on_stop:
raise NotImplementedError( raise NotImplementedError(
@ -286,13 +287,15 @@ class ReflinkVolume(qubes.storage.Volume):
_create_sparse_file(self._path_import, self.size) _create_sparse_file(self._path_import, self.size)
return self._path_import return self._path_import
def import_data_end(self, success): def _import_data_end(self, success):
if success: if success:
self._commit(self._path_import) self._commit(self._path_import)
else: else:
_remove_file(self._path_import) _remove_file(self._path_import)
return self return self
import_data_end = _unblock(_import_data_end)
@_unblock @_unblock
def import_volume(self, src_volume): def import_volume(self, src_volume):
if not self.save_on_stop: if not self.save_on_stop:
@ -300,9 +303,9 @@ class ReflinkVolume(qubes.storage.Volume):
try: try:
_copy_file(src_volume.export(), self._path_import) _copy_file(src_volume.export(), self._path_import)
except: except:
self.import_data_end(False) self._import_data_end(False)
raise raise
self.import_data_end(True) self._import_data_end(True)
return self return self
def _path_revision(self, number, timestamp=None): def _path_revision(self, number, timestamp=None):