parallelvirtualcluster/pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 115 Wiki Activity

Gracefully handle not being able to remove oruself from list

Browse Source
This commit is contained in:
Joshua Boniface
2018-06-02 15:43:02 -04:00
parent 152cba5e19
commit a155eb5fab
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NodeInstance.py
View File

@@ -99,7 +99,7 @@ class NodeInstance(threading.Thread):
for domain, instance in self.s_domain.items(): for domain, instance in self.s_domain.items():
instance.manage_vm_state() instance.manage_vm_state()
# Remove non-running VMs from our list # Remove any non-running VMs from our list
for domain in self.domain_list: for domain in self.domain_list:
try: try:
buuid = uuid.UUID(domain).bytes buuid = uuid.UUID(domain).bytes

10
VMInstance.py
View File

@@ -56,14 +56,20 @@ class VMInstance:
print("Forcibly stopping VM %s" % self.domuuid) print("Forcibly stopping VM %s" % self.domuuid)
self.dom.destroy() self.dom.destroy()
if self.domuuid in self.thishypervisor.domain_list: if self.domuuid in self.thishypervisor.domain_list:
self.thishypervisor.domain_list.remove(self.domuuid) try:
self.thishypervisor.domain_list.remove(self.domuuid)
except ValueError:
pass
# Shutdown the VM gracefully # Shutdown the VM gracefully
def shutdown_vm(self): def shutdown_vm(self):
print("Stopping VM %s" % self.domuuid) print("Stopping VM %s" % self.domuuid)
self.dom.shutdown() self.dom.shutdown()
if self.domuuid in self.thishypervisor.domain_list: if self.domuuid in self.thishypervisor.domain_list:
self.thishypervisor.domain_list.remove(self.domuuid) try:
self.thishypervisor.domain_list.remove(self.domuuid)
except ValueError:
pass
# Migrate the VM to a target host # Migrate the VM to a target host
def migrate_vm(self): def migrate_vm(self):