openstack
/
ceilometer
Code Issues Proposed changes

Merge "Temporary failures should be treated as temporary."

This commit is contained in:
Zuul 2020-04-09 12:39:12 +00:00 committed by Gerrit Code Review
parent 571e1d3c85 cf86cc3b7a
commit 75b9d4e914
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 @@ from unittest 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)