openstack/aodh
Code Issues Proposed changes

Use libvirt num_cpu for CPU utilization calculation.

Browse Source 
Previously we used the vcpus count for the corresponding flavor,
but this can be incorrect if the instance type was deleted and
re-created with a different number of cores after the instance
was booted.

Also the total number of CPUs on-host is dropped from the formula
as this is not relevant to the CPU util for the instance.

Change-Id: I23e2ad30696f11f413fd1570fe85c3a12fb0bf1e
This commit is contained in:
Eoghan Glynn 2012-11-14 14:35:58 +00:00
parent cdc962dffb
commit 7e595e8f28
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/compute/libvirt.py
View File

@ -18,7 +18,6 @@
import copy
import datetime
import multiprocessing
from lxml import etree
@ -167,8 +166,7 @@ class CPUPollster(LibVirtPollster):
prev_timestamp = prev_times[1]
delta = self.utilization_map[instance.id][1] - prev_timestamp
elapsed = (delta.seconds * (10 ** 6) + delta.microseconds) * 1000
cores_fraction = (instance.flavor['vcpus'] * 1.0 /
multiprocessing.cpu_count())
cores_fraction = 1.0 / cpu_info['num_cpu']
# account for cpu_time being reset when the instance is restarted
time_used = (cpu_info['cpu_time'] - prev_cpu
if prev_cpu <= cpu_info['cpu_time'] else

1
ceilometer/nova_client.py
View File

@ -54,7 +54,6 @@ class Client(object):
for instance in instances:
fid = instance.flavor['id']
instance.flavor['name'] = flavors[fid].name
instance.flavor['vcpus'] = flavors[fid].vcpus
return instances
@logged

9
tests/compute/test_libvirt.py
View File

@ -59,7 +59,7 @@ class TestLibvirtBase(test_base.TestCase):
setattr(self.instance, 'OS-EXT-SRV-ATTR:instance_name',
self.instance.name)
self.instance.id = 1
self.instance.flavor = {'name': 'm1.small', 'id': 2, 'vcpus': 1}
self.instance.flavor = {'name': 'm1.small', 'id': 2}
flags.FLAGS.compute_driver = 'libvirt.LibvirtDriver'
flags.FLAGS.connection_type = 'libvirt'
@ -215,16 +215,15 @@ class TestCPUPollster(TestLibvirtBase):
self.pollster = libvirt.CPUPollster()
def test_get_counter(self):
self.instance.vcpus = 1
conn = fake_libvirt_conn(self.mox, 3)
self.mox.StubOutWithMock(conn, 'get_info')
conn.get_info({'name': self.instance.name}).AndReturn(
{'cpu_time': 1 * (10 ** 6)})
{'cpu_time': 1 * (10 ** 6), 'num_cpu': 2})
conn.get_info({'name': self.instance.name}).AndReturn(
{'cpu_time': 3 * (10 ** 6)})
{'cpu_time': 3 * (10 ** 6), 'num_cpu': 2})
# cpu_time resets on instance restart
conn.get_info({'name': self.instance.name}).AndReturn(
{'cpu_time': 2 * (10 ** 6)})
{'cpu_time': 2 * (10 ** 6), 'num_cpu': 2})
self.mox.ReplayAll()
def _verify_cpu_metering(zero, expected_time):