openstack/aodh
Code Issues Proposed changes

Instance pollster emits instance.<type> meter

Browse Source 
Fixes bug 1071486

Previously the instance pollster emitted only the instance meter,
whereas the notification handler for the instance.exists event
emitted both instance and instance.<type>.

Since the pollster & handler would generally be triggered at different
frequencies (e.g. every 600s versus once an hour) this led to an
imbalance in the metering store whereby the instance counters didn't
match the sum of the per-flavor counters as expected.

Change-Id: Ic76a645f150a87bc92b4ccfc7a777dfe13502467
This commit is contained in:
Eoghan Glynn 2012-10-25 21:00:29 +00:00
parent 3deb7628fc
commit 365c7a849a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/compute/libvirt.py
View File

@ -68,6 +68,12 @@ class InstancePollster(plugin.ComputePollster):
type=counter.TYPE_GAUGE,
volume=1,
)
yield make_counter_from_instance(instance,
name='instance:%s' %
instance.instance_type.name,
type=counter.TYPE_GAUGE,
volume=1,
)
class DiskIOPollster(plugin.ComputePollster):

8
tests/compute/test_libvirt.py
View File

@ -51,11 +51,17 @@ class TestInstancePollster(unittest.TestCase):
self.instance = mock.MagicMock()
self.instance.name = 'instance-00000001'
self.instance.id = 1
self.instance.instance_type = mock.MagicMock()
self.instance.instance_type.name = 'm1.small'
flags.FLAGS.compute_driver = 'libvirt.LibvirtDriver'
flags.FLAGS.connection_type = 'libvirt'
def test_get_counter(self):
list(self.pollster.get_counters(self.manager, self.instance))
counters = list(self.pollster.get_counters(self.manager,
self.instance))
self.assertEquals(len(counters), 2)
self.assertEqual(counters[0].name, 'instance')
self.assertEqual(counters[1].name, 'instance:m1.small')
class TestDiskIOPollster(unittest.TestCase):