diff options
author | Matthias Runge <mrunge@redhat.com> | 2020-04-01 09:11:57 +0200 |
---|---|---|
committer | Matthias Runge <mrunge@redhat.com> | 2020-05-05 16:03:59 +0200 |
commit | 80bdf6bc92d721f813a98f307eae465ac8dfe922 (patch) | |
tree | ceb56e3826309d944581abcbddfafddabd8fd80c | |
parent | 25d057f4b69e8c9d57ce1f1915c094f3891a233f (diff) | |
download | ceilometer-80bdf6bc92d721f813a98f307eae465ac8dfe922.tar.gz |
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 cf86cc3b7ac41f62cf6a359e8e2d97b01542cde0)
-rw-r--r-- | ceilometer/compute/pollsters/__init__.py | 1 | ||||
-rw-r--r-- | ceilometer/tests/unit/compute/pollsters/test_memory.py | 8 | ||||
-rw-r--r-- | ceilometer/tests/unit/compute/pollsters/test_perf.py | 3 |
3 files changed, 0 insertions, 12 deletions
diff --git a/ceilometer/compute/pollsters/__init__.py b/ceilometer/compute/pollsters/__init__.py index e03c571c..ba90fb50 100644 --- a/ceilometer/compute/pollsters/__init__.py +++ b/ceilometer/compute/pollsters/__init__.py @@ -158,7 +158,6 @@ class GenericComputePollster(plugin_base.PollsterBase): '%(instance_id)s, non-fatal reason: %(exc)s', {'pollster': self.__class__.__name__, 'instance_id': instance.id, 'exc': e}) - raise plugin_base.PollsterPermanentError(resources) except ceilometer.NotImplementedError: # Selected inspector does not implement this pollster. LOG.debug('%(inspector)s does not provide data for ' diff --git a/ceilometer/tests/unit/compute/pollsters/test_memory.py b/ceilometer/tests/unit/compute/pollsters/test_memory.py index 39f9048a..dac43e4b 100644 --- a/ceilometer/tests/unit/compute/pollsters/test_memory.py +++ b/ceilometer/tests/unit/compute/pollsters/test_memory.py @@ -18,7 +18,6 @@ import mock from ceilometer.compute.pollsters import instance_stats from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.polling import manager -from ceilometer.polling import plugin_base from ceilometer.tests.unit.compute.pollsters import base @@ -62,9 +61,6 @@ class TestMemoryPollster(base.TestPollsterBase): def all_samples(): return list(pollster.get_samples(mgr, {}, [self.instance])) - self.assertRaises(plugin_base.PollsterPermanentError, - all_samples) - class TestResidentMemoryPollster(base.TestPollsterBase): @@ -141,8 +137,6 @@ class TestMemorySwapPollster(base.TestPollsterBase): def all_samples(): return list(pollster.get_samples(mgr, {}, [self.instance])) - self.assertRaises(plugin_base.PollsterPermanentError, all_samples) - class TestMemoryBandwidthPollster(base.TestPollsterBase): @@ -184,5 +178,3 @@ class TestMemoryBandwidthPollster(base.TestPollsterBase): def all_samples(): return list(pollster.get_samples(mgr, {}, [self.instance])) - - self.assertRaises(plugin_base.PollsterPermanentError, all_samples) diff --git a/ceilometer/tests/unit/compute/pollsters/test_perf.py b/ceilometer/tests/unit/compute/pollsters/test_perf.py index dc550139..c881becc 100644 --- a/ceilometer/tests/unit/compute/pollsters/test_perf.py +++ b/ceilometer/tests/unit/compute/pollsters/test_perf.py @@ -15,7 +15,6 @@ from ceilometer.compute.pollsters import instance_stats from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.polling import manager -from ceilometer.polling import plugin_base from ceilometer.tests.unit.compute.pollsters import base @@ -80,5 +79,3 @@ class TestPerfPollster(base.TestPollsterBase): def all_samples(): return list(pollster.get_samples(mgr, {}, [self.instance])) - - self.assertRaises(plugin_base.PollsterPermanentError, all_samples) |