From 4d088162c3816a2041d0e8fd5dd28377d926ec4d Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 8 Nov 2012 23:12:34 +0100 Subject: [PATCH] compute: remove get_disks work-around The bug referenced on get_disks in nova has been fixed and the fix released in Folsom. Change-Id: I5443bb918166b71b6af2216776044c2a76cee704 Signed-off-by: Julien Danjou --- ceilometer/compute/libvirt.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/ceilometer/compute/libvirt.py b/ceilometer/compute/libvirt.py index 6a482602e..1db1b213e 100644 --- a/ceilometer/compute/libvirt.py +++ b/ceilometer/compute/libvirt.py @@ -101,22 +101,11 @@ class DiskIOPollster(LibVirtPollster): "errors=%d", ]) - def _get_disks(self, conn, instance): - """Get disks of an instance, only used to bypass bug#998089.""" - domain = conn._conn.lookupByName(instance) - tree = etree.fromstring(domain.XMLDesc(0)) - return filter(bool, - [target.get('dev') - for target in tree.findall('devices/disk/target') - ]) - def get_counters(self, manager, instance): conn = get_libvirt_connection() - # TODO(jd) This does not work see bug#998089 - # for disk in conn.get_disks(instance.name): instance_name = _instance_name(instance) try: - disks = self._get_disks(conn, instance_name) + disks = conn.get_disks(instance_name) except Exception as err: self.LOG.warning('Ignoring instance %s: %s', instance_name, err)