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

More bugfixes

This commit is contained in:
Joshua Boniface 2018-06-12 21:44:06 -04:00
parent 3827261cc9
commit 75efefada3
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
VMInstance.py
View File

@ -99,6 +99,7 @@ class VMInstance:
except ValueError: except ValueError:
pass pass
ansiiprint.echo('Successfully terminated VM', '{}:'.format(self.domuuid), 'o') ansiiprint.echo('Successfully terminated VM', '{}:'.format(self.domuuid), 'o')
self.dom = None
self.instop = False self.instop = False
# Stop the VM forcibly # Stop the VM forcibly
@ -251,11 +252,11 @@ class VMInstance:
return 0 return 0
# VM should be stopped # VM should be stopped
if running == libvirt.VIR_DOMAIN_RUNNING and self.state == "stop" and self.hypervisor == self.thishypervisor.name: if running == libvirt.VIR_DOMAIN_RUNNING and self.state == "stop" and self.hypervisor == self.thishypervisor.name and self.dom != None:
self.stop_vm() self.stop_vm()
# VM should be shut down # VM should be shut down
elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "shutdown" and self.hypervisor == self.thishypervisor.name: elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "shutdown" and self.hypervisor == self.thishypervisor.name and self.dom != None:
self.shutdown_vm() self.shutdown_vm()
# VM should be migrated to this hypervisor # VM should be migrated to this hypervisor
@ -263,11 +264,11 @@ class VMInstance:
self.receive_migrate() self.receive_migrate()
# VM should be migrated away from this hypervisor # VM should be migrated away from this hypervisor
elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "migrate" and self.hypervisor != self.thishypervisor.name: elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "migrate" and self.hypervisor != self.thishypervisor.name and self.dom != None:
self.migrate_vm() self.migrate_vm()
# VM should be running but not on this hypervisor # VM should be running but not on this hypervisor
elif running == libvirt.VIR_DOMAIN_RUNNING and self.state != "migrate" and self.hypervisor != self.thishypervisor.name: elif running == libvirt.VIR_DOMAIN_RUNNING and self.state != "migrate" and self.hypervisor != self.thishypervisor.name and self.dom != None:
self.terminate_vm() self.terminate_vm()
# VM is already running and should be # VM is already running and should be

16
pvc.py
View File

@ -867,7 +867,8 @@ def _vm_list(hypervisor):
# Open a Zookeeper connection # Open a Zookeeper connection
zk = pvcf.startZKConnection(zk_host) zk = pvcf.startZKConnection(zk_host)
vm_list = zk.get_children('/domains') vm_list_raw = zk.get_children('/domains')
vm_list = []
vm_list_output = [] vm_list_output = []
vm_hypervisor = {} vm_hypervisor = {}
@ -878,13 +879,18 @@ def _vm_list(hypervisor):
vm_memory = {} vm_memory = {}
vm_vcpu = {} vm_vcpu = {}
# Gather information for printing # If we're limited, remove other nodes' VMs
for vm in vm_list: for vm in vm_list_raw:
# Check hypervisor to avoid unneeded ZK calls # Check hypervisor to avoid unneeded ZK calls
vm_hypervisor[vm] = zk.get('/domains/{}/hypervisor'.format(vm))[0].decode('ascii') vm_hypervisor[vm] = zk.get('/domains/{}/hypervisor'.format(vm))[0].decode('ascii')
if hypervisor != None and vm_hypervisor[vm] != hypervisor: if hypervisor != None:
continue if vm_hypervisor[vm] == hypervisor:
vm_list.append(vm)
else:
vm_list.append(vm)
# Gather information for printing
for vm in vm_list:
vm_state[vm] = zk.get('/domains/{}/state'.format(vm))[0].decode('ascii') vm_state[vm] = zk.get('/domains/{}/state'.format(vm))[0].decode('ascii')
vm_lasthypervisor = zk.get('/domains/{}/lasthypervisor'.format(vm))[0].decode('ascii') vm_lasthypervisor = zk.get('/domains/{}/lasthypervisor'.format(vm))[0].decode('ascii')
if vm_lasthypervisor != '': if vm_lasthypervisor != '':