openstack/aodh
Code Issues Proposed changes

Protect agent startup from import errors in plugins

Browse Source 
Watch for import errors and log them but do not let them propagate, so
that the agent will still run even if a library used by a requested
plugin is missing.

Change-Id: I0fbb708b0c502ac07b5d5f7c83ac3ed46b0fc46d
This commit is contained in:
Doug Hellmann 2015-02-23 10:49:39 -05:00
parent e9d4e1eb2d
commit bc802a91c8
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ceilometer/agent/base.py
View File

@ -238,10 +238,17 @@ class AgentManager(os_service.Service):
else 'ceilometer.%s' % category) else 'ceilometer.%s' % category)
def _catch_extension_load_error(mgr, ep, exc): def _catch_extension_load_error(mgr, ep, exc):
# Extension raising ExtensionLoadError can be ignored # Extension raising ExtensionLoadError can be ignored,
# and ignore anything we can't import as a safety measure.
if isinstance(exc, plugin_base.ExtensionLoadError): if isinstance(exc, plugin_base.ExtensionLoadError):
LOG.error(_("Skip loading extension for %s") % ep.name) LOG.error(_("Skip loading extension for %s") % ep.name)
return return
if isinstance(exc, ImportError):
LOG.error(
_("Failed to import extension for %(name)s: %(error)s"),
{'name': ep.name, 'error': exc},
)
return
raise exc raise exc
return extension.ExtensionManager( return extension.ExtensionManager(

11
ceilometer/tests/agent/test_manager.py
View File

@ -80,6 +80,17 @@ class TestManager(base.BaseTestCase):
LOG.error.assert_has_calls(calls=calls, LOG.error.assert_has_calls(calls=calls,
any_order=True) any_order=True)
# Skip loading pollster upon ImportError
@mock.patch('ceilometer.ipmi.pollsters.node._Base.__init__',
mock.Mock(side_effect=ImportError))
@mock.patch('ceilometer.ipmi.pollsters.sensor.SensorPollster.__init__',
mock.Mock(return_value=None))
def test_import_error_in_plugin(self):
mgr = manager.AgentManager(namespaces=['ipmi'],
pollster_list=['hardware.ipmi.node.*'])
# 0 pollsters
self.assertEqual(0, len(mgr.extensions))
# Exceptions other than ExtensionLoadError are propagated # Exceptions other than ExtensionLoadError are propagated
@mock.patch('ceilometer.ipmi.pollsters.node._Base.__init__', @mock.patch('ceilometer.ipmi.pollsters.node._Base.__init__',
mock.Mock(side_effect=PollingException)) mock.Mock(side_effect=PollingException))