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

qvm-shutdown: Do not mutate list while iterating through it

Browse Source 
This commit makes sure that the Python list vms_list is not mutated
while the code is iterating through it. To the best of my knowledge,
this is a problematic operation.

To rectify this issue, a new temporary list is instantiated, and
the VM objects that have shut down are appended to the temporary list,
which is afterwards used to remove the shut-down VM objects from the
vms_list.

Signed-off-by: M. Vefa Bicakci <m.v.b@runbox.com>
This commit is contained in:
M. Vefa Bicakci 2017-03-14 16:31:51 +03:00 committed by Marek Marczykowski-Górecki
parent 5e2bd5ea64
commit 6bcc97b859
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qvm-tools/qvm-shutdown
View File

@ -101,22 +101,31 @@ def main():
while len (vms_list):
if options.verbose:
print >> sys.stderr, "Waiting for VMs: ", [vm.name for vm in vms_list]
shut_down_vms = []
for vm in vms_list:
if not vm.is_running():
vms_list.remove (vm)
shut_down_vms.append(vm)
continue
if vm.get_power_state() == "Halting":
if vm in halting_vms:
vm.force_shutdown()
continue
else:
halting_vms.append(vm)
if shutdown_counter > int(options.wait_time):
# kill the VM
if options.verbose:
print >> sys.stderr, "Killing the (apparently hanging) VM '{0}'...".format(vm.name)
vm.force_shutdown()
#vms_list.remove(vm)
#shut_down_vms.append(vm)
for vm in shut_down_vms:
if vm in vms_list:
vms_list.remove(vm)
shutdown_counter += 1
time.sleep (1)