Some more cleanups to ake this more readable and efficient

This commit is contained in:
Joshua Boniface 2018-06-04 17:04:33 -04:00
parent 0d30804fc2
commit 4ab180d410
1 changed files with 13 additions and 13 deletions

View File

@ -141,26 +141,26 @@ class NodeInstance(threading.Thread):
self.state = 'flush'
while True:
# Toggle state management of all VMs
# Toggle state management of all VMs and remove any non-running VMs
for domain, instance in self.s_domain.items():
if instance.inshutdown == False and domain in self.domain_list:
instance.manage_vm_state()
# Remove any non-running VMs from our list
for domain in self.domain_list:
dom = pvcf.lookupByUUID(domain)
if dom == None:
try:
self.domain_list.remove(domain)
except:
pass
else:
state = dom.state()[0]
if state != libvirt.VIR_DOMAIN_RUNNING:
if instance.dom == None:
try:
self.domain_list.remove(domain)
except:
pass
else:
try:
state = instance.dom.state()[0]
except:
state = libvirt.VIR_DOMAIN_NOSTATE
if state != libvirt.VIR_DOMAIN_RUNNING:
try:
self.domain_list.remove(domain)
except:
pass
# Set our information in zookeeper
self.memfree = conn.getFreeMemory()