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

Fix race condition in QubesVm.get_cputime/get_mem

Browse Source 
When domain is destroyed after isActive check, but before getting
actuall info, it would fail. So handle this situation.
This commit is contained in:
Marek Marczykowski-Górecki 2015-10-27 21:31:59 +01:00
parent e475e291a9
commit 1c0ade6166
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core-modules/000QubesVm.py
View File

@ -760,6 +760,9 @@ class QubesVm(object):
except libvirt.libvirtError as e: except libvirt.libvirtError as e:
if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN:
return 0 return 0
# libxl_domain_info failed - domain no longer exists
elif e.get_error_code() == libvirt.VIR_INTERNAL_ERROR:
return 0
else: else:
raise raise
@ -774,6 +777,9 @@ class QubesVm(object):
except libvirt.libvirtError as e: except libvirt.libvirtError as e:
if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN:
return 0 return 0
# libxl_domain_info failed - domain no longer exists
elif e.get_error_code() == libvirt.VIR_INTERNAL_ERROR:
return 0
else: else:
raise raise