Merge "Temporary failures should be treated as temporary." into stable/train13.1.1

3 files changed, 0 insertions, 12 deletions

diff --git a/ceilometer/compute/pollsters/__init__.py b/ceilometer/compute/pollsters/__init__.py
index c4bed44d..2f810942 100644
--- a/ceilometer/compute/pollsters/__init__.py
+++ b/ceilometer/compute/pollsters/__init__.py
@@ -163,7 +163,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)