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

backup: improve error logging

Browse Source 
Include VM and volume name in data-related error mesages.

QubesOS/qubes-issues#1214
This commit is contained in:
Marek Marczykowski-Górecki 2017-07-17 23:32:31 +02:00
parent f2fa613dce
commit ce2215c603
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qubesadmin/backup/__init__.py
View File

@ -1733,6 +1733,22 @@ class BackupRestore(object):
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
self.log.error('Failed to set application list for %s', vm.name) self.log.error('Failed to set application list for %s', vm.name)
def _handle_volume_data(self, vm, volume, stream):
'''Wrap volume data import with logging'''
try:
volume.import_data(stream)
except Exception as err: # pylint: disable=broad-except
self.log.error('Failed to restore volume %s of VM %s: %s',
volume.name, vm.name, err)
def _handle_volume_size(self, vm, volume, size):
'''Wrap volume resize with logging'''
try:
volume.resize(size)
except Exception as err: # pylint: disable=broad-except
self.log.error('Failed to resize volume %s of VM %s: %s',
volume.name, vm.name, err)
def restore_do(self, restore_info): def restore_do(self, restore_info):
''' '''
@ -1765,8 +1781,10 @@ class BackupRestore(object):
for name, volume in vm.volumes.items(): for name, volume in vm.volumes.items():
if not volume.save_on_stop: if not volume.save_on_stop:
continue continue
data_func = volume.import_data data_func = functools.partial(
size_func = volume.resize self._handle_volume_data, vm, volume)
size_func = functools.partial(
self._handle_volume_size, vm, volume)
handlers[os.path.join(vm_info.subdir, name + '.img')] = \ handlers[os.path.join(vm_info.subdir, name + '.img')] = \
(data_func, size_func) (data_func, size_func)
handlers[os.path.join(vm_info.subdir, 'firewall.xml')] = ( handlers[os.path.join(vm_info.subdir, 'firewall.xml')] = (