Restore VM resource allocation location
Commit 5f1432ccdd
changed where these
happen due to a bug after fencing. However this completely broke node
resource reporting as only the final instance will be queried here.
Revert this change and look further into the original bug.
This commit is contained in:
parent
1a05077b10
commit
1ba37fe33d
|
@ -477,6 +477,10 @@ def collect_vm_stats(logger, config, zkhandler, this_node, queue):
|
||||||
fixed_d_domain = this_node.d_domain.copy()
|
fixed_d_domain = this_node.d_domain.copy()
|
||||||
for domain, instance in fixed_d_domain.items():
|
for domain, instance in fixed_d_domain.items():
|
||||||
if domain in this_node.domain_list:
|
if domain in this_node.domain_list:
|
||||||
|
# Add the allocated memory to our memalloc value
|
||||||
|
memalloc += instance.getmemory()
|
||||||
|
memprov += instance.getmemory()
|
||||||
|
vcpualloc += instance.getvcpus()
|
||||||
if instance.getstate() == "start" and instance.getnode() == this_node.name:
|
if instance.getstate() == "start" and instance.getnode() == this_node.name:
|
||||||
if instance.getdom() is not None:
|
if instance.getdom() is not None:
|
||||||
try:
|
try:
|
||||||
|
@ -532,11 +536,6 @@ def collect_vm_stats(logger, config, zkhandler, this_node, queue):
|
||||||
continue
|
continue
|
||||||
domain_memory_stats = domain.memoryStats()
|
domain_memory_stats = domain.memoryStats()
|
||||||
domain_cpu_stats = domain.getCPUStats(True)[0]
|
domain_cpu_stats = domain.getCPUStats(True)[0]
|
||||||
|
|
||||||
# Add the allocated memory to our memalloc value
|
|
||||||
memalloc += instance.getmemory()
|
|
||||||
memprov += instance.getmemory()
|
|
||||||
vcpualloc += instance.getvcpus()
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
if debug:
|
if debug:
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue