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

Change where the memalloc increase is

This commit is contained in:
Joshua Boniface 2018-07-17 21:37:27 -04:00
parent 344881ff27
commit 7c89fa8aea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pvcd/NodeInstance.py
View File

@ -227,8 +227,11 @@ class NodeInstance():
self.daemon_state = 'run' self.daemon_state = 'run'
# Toggle state management of dead VMs to restart them # Toggle state management of dead VMs to restart them
memalloc = 0
for domain, instance in self.s_domain.items(): for domain, instance in self.s_domain.items():
if instance.inshutdown == False and domain in self.domain_list: if instance.inshutdown == False and domain in self.domain_list:
# Add the allocated memory to our memalloc value
memalloc += instance.maxMemory()
if instance.getstate() == 'start' and instance.gethypervisor() == self.name: if instance.getstate() == 'start' and instance.gethypervisor() == self.name:
if instance.getdom() != None: if instance.getdom() != None:
try: try:
@ -239,12 +242,9 @@ class NodeInstance():
zkhandler.writedata(self.zk_conn, { '/domains/{}/state'.format(domain): instance.getstate() }) zkhandler.writedata(self.zk_conn, { '/domains/{}/state'.format(domain): instance.getstate() })
# Ensure that any running VMs are readded to the domain_list # Ensure that any running VMs are readded to the domain_list
memalloc = 0
running_domains = lv_conn.listAllDomains(libvirt.VIR_CONNECT_LIST_DOMAINS_ACTIVE) running_domains = lv_conn.listAllDomains(libvirt.VIR_CONNECT_LIST_DOMAINS_ACTIVE)
for domain in running_domains: for domain in running_domains:
domain_uuid = domain.UUIDString() domain_uuid = domain.UUIDString()
# Add the allocated memory to our memalloc value
memalloc += instance.maxMemory()
if domain_uuid not in self.domain_list: if domain_uuid not in self.domain_list:
self.domain_list.append(domain_uuid) self.domain_list.append(domain_uuid)