openstack
/
ironic
Code Issues Proposed changes

Merge "Don't reraise Exceptions from agent driver"

This commit is contained in:
Jenkins 2014-09-25 08:21:35 +00:00 committed by Gerrit Code Review
parent 8bad6fbfbc 1edf663e59
commit 058630628a
2 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ironic/drivers/modules/agent.py
View File

@ -377,11 +377,18 @@ class AgentVendorInterface(base.VendorInterface):
func = self.vendor_routes[method]
try:
return func(task, **kwargs)
except Exception:
# catch-all in case something bubbles up here
except exception.IronicException as e:
with excutils.save_and_reraise_exception():
# log this because even though the exception is being
# reraised, it won't be handled if it is an async. call.
LOG.exception(_LE('vendor_passthru failed with method %s'),
method)
except Exception as e:
# catch-all in case something bubbles up here
# log this because even though the exception is being
# reraised, it won't be handled if it is an async. call.
LOG.exception(_LE('vendor_passthru failed with method %s'), method)
raise exception.VendorPassthruException(message=e)
def _heartbeat(self, task, **kwargs):
"""Method for agent to periodically check in.
@ -402,7 +409,10 @@ class AgentVendorInterface(base.VendorInterface):
{'node': node.uuid,
'heartbeat': driver_info.get('agent_last_heartbeat')})
driver_info['agent_last_heartbeat'] = int(_time())
# FIXME(rloo): This could raise KeyError exception if 'agent_url'
# wasn't specified. Instead, raise MissingParameterValue.
driver_info['agent_url'] = kwargs['agent_url']
node.driver_info = driver_info
node.save()

47
ironic/tests/drivers/test_agent.py
View File

@ -319,3 +319,50 @@ class TestAgentVendor(db_base.DbTestCase):
with task_manager.acquire(
self.context, self.node['uuid'], shared=True) as task:
self.passthru._heartbeat(task, **kwargs)
def test_heartbeat_bad(self):
kwargs = {}
with task_manager.acquire(
self.context, self.node['uuid'], shared=True) as task:
self.assertRaises(KeyError,
self.passthru._heartbeat, task, **kwargs)
@mock.patch('ironic.drivers.modules.agent.AgentVendorInterface'
'._heartbeat')
def test_vendor_passthru_heartbeat(self, mock_heartbeat):
kwargs = {
'method': 'heartbeat',
}
self.passthru.vendor_routes['heartbeat'] = mock_heartbeat
with task_manager.acquire(
self.context, self.node['uuid'], shared=True) as task:
self.passthru.vendor_passthru(task, **kwargs)
mock_heartbeat.assert_called_once_with(task, **kwargs)
@mock.patch('ironic.drivers.modules.agent.AgentVendorInterface'
'._heartbeat')
def test_vendor_passthru_heartbeat_ironic_exc(self, mock_heartbeat):
mock_heartbeat.side_effect = exception.IronicException()
kwargs = {
'method': 'heartbeat',
}
self.passthru.vendor_routes['heartbeat'] = mock_heartbeat
with task_manager.acquire(
self.context, self.node['uuid'], shared=True) as task:
self.assertRaises(exception.IronicException,
self.passthru.vendor_passthru, task, **kwargs)
mock_heartbeat.assert_called_once_with(task, **kwargs)
@mock.patch('ironic.drivers.modules.agent.AgentVendorInterface'
'._heartbeat')
def test_vendor_passthru_heartbeat_exception(self, mock_heartbeat):
mock_heartbeat.side_effect = KeyError()
kwargs = {
'method': 'heartbeat',
}
self.passthru.vendor_routes['heartbeat'] = mock_heartbeat
with task_manager.acquire(
self.context, self.node['uuid'], shared=True) as task:
self.assertRaises(exception.VendorPassthruException,
self.passthru.vendor_passthru, task, **kwargs)
mock_heartbeat.assert_called_once_with(task, **kwargs)