Clean up some handling of restarting dead VMs

This commit is contained in:
Joshua Boniface 2018-06-12 01:54:01 -04:00
parent dd2560c2f8
commit a87bf4bc4a
2 changed files with 11 additions and 19 deletions

View File

@ -200,28 +200,17 @@ class NodeInstance():
else:
self.daemon_state = 'start'
# Toggle state management of dead VMs
# Toggle state management of dead VMs to restart them
for domain, instance in self.s_domain.items():
if instance.inshutdown == False and domain in self.domain_list:
if instance.getstate() == 'start' and instance.gethypervisor() == self.name and instance.dom == None:
instance.manage_vm_state()
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:
if instance.getstate() == 'start' and instance.gethypervisor() == self.name:
if instance.getdom() != None:
try:
self.domain_list.remove(domain)
except:
pass
if instance.getdom().state()[0] != libvirt.VIR_DOMAIN_RUNNING:
raise
except Exception as e:
# Toggle a state "change"
self.zk.set('/domains/{}/state'.format(domain), instance.getstate().encode('ascii'))
# Set our information in zookeeper
self.name = conn.getHostname()

View File

@ -54,6 +54,9 @@ class VMInstance:
def gethypervisor(self):
return self.hypervisor
def getdom(self):
return self.dom
# Start up the VM
def start_vm(self, xmlconfig):
ansiiprint.echo('Starting VM', '{}:'.format(self.domuuid), 'i')