diff options
| author | Cao Shufeng <caosf.fnst@cn.fujitsu.com> | 2016-08-19 07:34:15 -0400 |
|---|---|---|
| committer | Cao Shufeng <caosf.fnst@cn.fujitsu.com> | 2016-08-19 07:34:15 -0400 |
| commit | 48790b66aadf503b7720770989d77b0bb8fa5365 (patch) | |
| tree | 3f6caf772e0626530c8424e09e844ce89033dc4e /ironic/conductor/task_manager.py | |
| parent | afd4f6dd614c0adfc70eacbabe307a30b5dad002 (diff) | |
| download | ironic-48790b66aadf503b7720770989d77b0bb8fa5365.tar.gz | |
Log node uuid rather than id when acquiring node lock
When attempting to get lock of a node, we get such log:
"Attempting to get exclusive lock on node 2 (for
port update)"
However, when reserving and releasing the same node lock,
we get such log:
"Node 7c3c747d-6315-4db8-8fa5-8e55cf2bcc34 successfully
reserved for port update (took 0.02 seconds)"
"Successfully released exclusive lock for port update
on node 7c3c747d-6315-4db8-8fa5-8e55cf2bcc34 (lock
was held 0.04 sec)"
Sometimes, we log node_id but in other places, we log
node_uuid. It will become a challenge for trouble shooting
with such inconsistent log.
With this change we always log node_uuid when acquiring node
lock.
Change-Id: Icac16d490d654c73cc99e5d2a9a7c682adbc2802
Closes-bug: #1602490
Diffstat (limited to 'ironic/conductor/task_manager.py')
| -rw-r--r-- | ironic/conductor/task_manager.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ironic/conductor/task_manager.py b/ironic/conductor/task_manager.py index 00173a285..668833065 100644 --- a/ironic/conductor/task_manager.py +++ b/ironic/conductor/task_manager.py @@ -203,15 +203,16 @@ class TaskManager(object): self._debug_timer = timeutils.StopWatch() try: + node = objects.Node.get(context, node_id) LOG.debug("Attempting to get %(type)s lock on node %(node)s (for " "%(purpose)s)", {'type': 'shared' if shared else 'exclusive', - 'node': node_id, 'purpose': purpose}) + 'node': node.uuid, 'purpose': purpose}) if not self.shared: self._lock() else: 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.portgroups = objects.Portgroup.list_by_node_id(context, |