openstack/ironic
Code Issues Proposed changes

Merge "Log node uuid rather than id when acquiring node lock"

Browse Source
This commit is contained in:
Jenkins 2016-08-21 08:52:23 +00:00 committed by Gerrit Code Review
commit 5e07d2bb4c
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic/conductor/task_manager.py
View File

@ -203,15 +203,16 @@ class TaskManager(object):
self._debug_timer = timeutils.StopWatch() self._debug_timer = timeutils.StopWatch()
try: try:
node = objects.Node.get(context, node_id)
LOG.debug("Attempting to get %(type)s lock on node %(node)s (for " LOG.debug("Attempting to get %(type)s lock on node %(node)s (for "
"%(purpose)s)", "%(purpose)s)",
{'type': 'shared' if shared else 'exclusive', {'type': 'shared' if shared else 'exclusive',
'node': node_id, 'purpose': purpose}) 'node': node.uuid, 'purpose': purpose})
if not self.shared: if not self.shared:
self._lock() self._lock()
else: else:
self._debug_timer.restart() self._debug_timer.restart()
self.node = objects.Node.get(context, node_id) self.node = node
self.ports = objects.Port.list_by_node_id(context, self.node.id) self.ports = objects.Port.list_by_node_id(context, self.node.id)
self.portgroups = objects.Portgroup.list_by_node_id(context, self.portgroups = objects.Portgroup.list_by_node_id(context,

17
ironic/tests/unit/conductor/test_task_manager.py
View File

@ -61,13 +61,13 @@ class TaskManagerTestCase(tests_db_base.DbTestCase):
self.assertFalse(task.shared) self.assertFalse(task.shared)
build_driver_mock.assert_called_once_with(task, driver_name=None) build_driver_mock.assert_called_once_with(task, driver_name=None)
node_get_mock.assert_called_once_with(self.context, 'fake-node-id')
reserve_mock.assert_called_once_with(self.context, self.host, reserve_mock.assert_called_once_with(self.context, self.host,
'fake-node-id') 'fake-node-id')
get_ports_mock.assert_called_once_with(self.context, self.node.id) get_ports_mock.assert_called_once_with(self.context, self.node.id)
get_portgroups_mock.assert_called_once_with(self.context, self.node.id) get_portgroups_mock.assert_called_once_with(self.context, self.node.id)
release_mock.assert_called_once_with(self.context, self.host, release_mock.assert_called_once_with(self.context, self.host,
self.node.id) self.node.id)
self.assertFalse(node_get_mock.called)
def test_excl_lock_with_driver( def test_excl_lock_with_driver(
self, get_portgroups_mock, get_ports_mock, build_driver_mock, self, get_portgroups_mock, get_ports_mock, build_driver_mock,
@ -84,13 +84,13 @@ class TaskManagerTestCase(tests_db_base.DbTestCase):
build_driver_mock.assert_called_once_with( build_driver_mock.assert_called_once_with(
task, driver_name='fake-driver') task, driver_name='fake-driver')
node_get_mock.assert_called_once_with(self.context, 'fake-node-id')
reserve_mock.assert_called_once_with(self.context, self.host, reserve_mock.assert_called_once_with(self.context, self.host,
'fake-node-id') 'fake-node-id')
get_ports_mock.assert_called_once_with(self.context, self.node.id) get_ports_mock.assert_called_once_with(self.context, self.node.id)
get_portgroups_mock.assert_called_once_with(self.context, self.node.id) get_portgroups_mock.assert_called_once_with(self.context, self.node.id)
release_mock.assert_called_once_with(self.context, self.host, release_mock.assert_called_once_with(self.context, self.host,
self.node.id) self.node.id)
self.assertFalse(node_get_mock.called)
def test_excl_nested_acquire( def test_excl_nested_acquire(
self, get_portgroups_mock, get_ports_mock, build_driver_mock, self, get_portgroups_mock, get_ports_mock, build_driver_mock,
@ -127,6 +127,9 @@ class TaskManagerTestCase(tests_db_base.DbTestCase):
mock.call(task2, driver_name=None)], mock.call(task2, driver_name=None)],
build_driver_mock.call_args_list) build_driver_mock.call_args_list)
self.assertEqual([mock.call(self.context, 'node-id1'),
mock.call(self.context, 'node-id2')],
node_get_mock.call_args_list)
self.assertEqual([mock.call(self.context, self.host, 'node-id1'), self.assertEqual([mock.call(self.context, self.host, 'node-id1'),
mock.call(self.context, self.host, 'node-id2')], mock.call(self.context, self.host, 'node-id2')],
reserve_mock.call_args_list) reserve_mock.call_args_list)
@ -137,7 +140,6 @@ class TaskManagerTestCase(tests_db_base.DbTestCase):
self.assertEqual([mock.call(self.context, self.host, node2.id), self.assertEqual([mock.call(self.context, self.host, node2.id),
mock.call(self.context, self.host, self.node.id)], mock.call(self.context, self.host, self.node.id)],
release_mock.call_args_list) release_mock.call_args_list)
self.assertFalse(node_get_mock.called)
def test_excl_lock_exception_then_lock( def test_excl_lock_exception_then_lock(
self, get_portgroups_mock, get_ports_mock, build_driver_mock, self, get_portgroups_mock, get_ports_mock, build_driver_mock,
@ -172,7 +174,7 @@ class TaskManagerTestCase(tests_db_base.DbTestCase):
task_manager.TaskManager, task_manager.TaskManager,
self.context, self.context,
'fake-node-id') 'fake-node-id')
node_get_mock.assert_called_with(self.context, 'fake-node-id')
reserve_mock.assert_called_with(self.context, self.host, reserve_mock.assert_called_with(self.context, self.host,
'fake-node-id') 'fake-node-id')
self.assertEqual(retry_attempts, reserve_mock.call_count) self.assertEqual(retry_attempts, reserve_mock.call_count)
@ -180,7 +182,6 @@ class TaskManagerTestCase(tests_db_base.DbTestCase):
self.assertFalse(get_portgroups_mock.called) self.assertFalse(get_portgroups_mock.called)
self.assertFalse(build_driver_mock.called) self.assertFalse(build_driver_mock.called)
self.assertFalse(release_mock.called) self.assertFalse(release_mock.called)
self.assertFalse(node_get_mock.called)
def test_excl_lock_get_ports_exception( def test_excl_lock_get_ports_exception(
self, get_portgroups_mock, get_ports_mock, build_driver_mock, self, get_portgroups_mock, get_ports_mock, build_driver_mock,
@ -193,13 +194,13 @@ class TaskManagerTestCase(tests_db_base.DbTestCase):
self.context, self.context,
'fake-node-id') 'fake-node-id')
node_get_mock.assert_called_once_with(self.context, 'fake-node-id')
reserve_mock.assert_called_once_with(self.context, self.host, reserve_mock.assert_called_once_with(self.context, self.host,
'fake-node-id') 'fake-node-id')
get_ports_mock.assert_called_once_with(self.context, self.node.id) get_ports_mock.assert_called_once_with(self.context, self.node.id)
self.assertFalse(build_driver_mock.called) self.assertFalse(build_driver_mock.called)
release_mock.assert_called_once_with(self.context, self.host, release_mock.assert_called_once_with(self.context, self.host,
self.node.id) self.node.id)
self.assertFalse(node_get_mock.called)
def test_excl_lock_get_portgroups_exception( def test_excl_lock_get_portgroups_exception(
self, get_portgroups_mock, get_ports_mock, build_driver_mock, self, get_portgroups_mock, get_ports_mock, build_driver_mock,
@ -212,13 +213,13 @@ class TaskManagerTestCase(tests_db_base.DbTestCase):
self.context, self.context,
'fake-node-id') 'fake-node-id')
node_get_mock.assert_called_once_with(self.context, 'fake-node-id')
reserve_mock.assert_called_once_with(self.context, self.host, reserve_mock.assert_called_once_with(self.context, self.host,
'fake-node-id') 'fake-node-id')
get_portgroups_mock.assert_called_once_with(self.context, self.node.id) get_portgroups_mock.assert_called_once_with(self.context, self.node.id)
self.assertFalse(build_driver_mock.called) self.assertFalse(build_driver_mock.called)
release_mock.assert_called_once_with(self.context, self.host, release_mock.assert_called_once_with(self.context, self.host,
self.node.id) self.node.id)
self.assertFalse(node_get_mock.called)
def test_excl_lock_build_driver_exception( def test_excl_lock_build_driver_exception(
self, get_portgroups_mock, get_ports_mock, build_driver_mock, self, get_portgroups_mock, get_ports_mock, build_driver_mock,
@ -232,6 +233,7 @@ class TaskManagerTestCase(tests_db_base.DbTestCase):
self.context, self.context,
'fake-node-id') 'fake-node-id')
node_get_mock.assert_called_once_with(self.context, 'fake-node-id')
reserve_mock.assert_called_once_with(self.context, self.host, reserve_mock.assert_called_once_with(self.context, self.host,
'fake-node-id') 'fake-node-id')
get_ports_mock.assert_called_once_with(self.context, self.node.id) get_ports_mock.assert_called_once_with(self.context, self.node.id)
@ -239,7 +241,6 @@ class TaskManagerTestCase(tests_db_base.DbTestCase):
build_driver_mock.assert_called_once_with(mock.ANY, driver_name=None) build_driver_mock.assert_called_once_with(mock.ANY, driver_name=None)
release_mock.assert_called_once_with(self.context, self.host, release_mock.assert_called_once_with(self.context, self.host,
self.node.id) self.node.id)
self.assertFalse(node_get_mock.called)
def test_shared_lock( def test_shared_lock(
self, get_portgroups_mock, get_ports_mock, build_driver_mock, self, get_portgroups_mock, get_ports_mock, build_driver_mock,

4
ironic/tests/unit/drivers/modules/test_agent_base_vendor.py
View File

@ -194,7 +194,9 @@ class TestBaseAgentVendor(db_base.DbTestCase):
with task_manager.acquire(self.context, self.node.uuid) as task: with task_manager.acquire(self.context, self.node.uuid) as task:
node = self.passthru.lookup(task.context, **kwargs) node = self.passthru.lookup(task.context, **kwargs)
self.assertEqual(expected, node['node']) self.assertEqual(expected, node['node'])
mock_get_node.assert_called_once_with(mock.ANY, 'fake-uuid') self.assertEqual([mock.call(self.context, self.node.uuid),
mock.call(self.context, 'fake-uuid')],
mock_get_node.call_args_list)
@mock.patch.object(objects.port.Port, 'get_by_address', @mock.patch.object(objects.port.Port, 'get_by_address',
spec_set=types.FunctionType) spec_set=types.FunctionType)