openstack
/
ceilometer
Code Issues Proposed changes

Temporary failures should be treated as temporary. 

There is no reason e.g to treat timeouts as permanent and thus these
sources should not be removed from polling.

Change-Id: Ifcb8dc7ca2c91f3d2482264afbd81df6e51c5937
(cherry picked from commit cf86cc3b7a)
This commit is contained in:
Matthias Runge 2020-04-01 09:11:57 +02:00
parent 25d057f4b6
commit 80bdf6bc92
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ceilometer/compute/pollsters/__init__.py
View File

@ -158,7 +158,6 @@ class GenericComputePollster(plugin_base.PollsterBase):
'%(instance_id)s, non-fatal reason: %(exc)s', '%(instance_id)s, non-fatal reason: %(exc)s',
{'pollster': self.__class__.__name__, {'pollster': self.__class__.__name__,
'instance_id': instance.id, 'exc': e}) 'instance_id': instance.id, 'exc': e})
raise plugin_base.PollsterPermanentError(resources)
except ceilometer.NotImplementedError: except ceilometer.NotImplementedError:
# Selected inspector does not implement this pollster. # Selected inspector does not implement this pollster.
LOG.debug('%(inspector)s does not provide data for ' LOG.debug('%(inspector)s does not provide data for '

8
ceilometer/tests/unit/compute/pollsters/test_memory.py
View File

@ -18,7 +18,6 @@ import mock
from ceilometer.compute.pollsters import instance_stats from ceilometer.compute.pollsters import instance_stats
from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.compute.virt import inspector as virt_inspector
from ceilometer.polling import manager from ceilometer.polling import manager
from ceilometer.polling import plugin_base
from ceilometer.tests.unit.compute.pollsters import base from ceilometer.tests.unit.compute.pollsters import base
@ -62,9 +61,6 @@ class TestMemoryPollster(base.TestPollsterBase):
def all_samples(): def all_samples():
return list(pollster.get_samples(mgr, {}, [self.instance])) return list(pollster.get_samples(mgr, {}, [self.instance]))
self.assertRaises(plugin_base.PollsterPermanentError,
all_samples)
class TestResidentMemoryPollster(base.TestPollsterBase): class TestResidentMemoryPollster(base.TestPollsterBase):
@ -141,8 +137,6 @@ class TestMemorySwapPollster(base.TestPollsterBase):
def all_samples(): def all_samples():
return list(pollster.get_samples(mgr, {}, [self.instance])) return list(pollster.get_samples(mgr, {}, [self.instance]))
self.assertRaises(plugin_base.PollsterPermanentError, all_samples)
class TestMemoryBandwidthPollster(base.TestPollsterBase): class TestMemoryBandwidthPollster(base.TestPollsterBase):
@ -184,5 +178,3 @@ class TestMemoryBandwidthPollster(base.TestPollsterBase):
def all_samples(): def all_samples():
return list(pollster.get_samples(mgr, {}, [self.instance])) return list(pollster.get_samples(mgr, {}, [self.instance]))
self.assertRaises(plugin_base.PollsterPermanentError, all_samples)

3
ceilometer/tests/unit/compute/pollsters/test_perf.py
View File

@ -15,7 +15,6 @@
from ceilometer.compute.pollsters import instance_stats from ceilometer.compute.pollsters import instance_stats
from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.compute.virt import inspector as virt_inspector
from ceilometer.polling import manager from ceilometer.polling import manager
from ceilometer.polling import plugin_base
from ceilometer.tests.unit.compute.pollsters import base from ceilometer.tests.unit.compute.pollsters import base
@ -80,5 +79,3 @@ class TestPerfPollster(base.TestPollsterBase):
def all_samples(): def all_samples():
return list(pollster.get_samples(mgr, {}, [self.instance])) return list(pollster.get_samples(mgr, {}, [self.instance]))
self.assertRaises(plugin_base.PollsterPermanentError, all_samples)