summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Harris <rconradharris@gmail.com>2012-07-23 16:59:52 +0000
committerRick Harris <rconradharris@gmail.com>2012-07-23 19:25:59 +0000
commit109a4321d4488cd8a6c3be8b8cfcb7baad819de6 (patch)
tree51d6990a68b4d967931019e92b1def7214e115d3
parent62b75bf7c4259993e493d66d2fdf256d59ed4aa9 (diff)
Log snapshot UUID and not OpaqueRef.
The OpaqueRef doesn't help troubleshooting since it can't be easily used to identify an image after the session finishes. UUID, which is invariant, is much more useful. Change-Id: I3b802e41e583bee84ee6f5d05e1ffc581761571d
-rw-r--r--nova/virt/xenapi/vm_utils.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 27065e471..592422325 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -487,10 +487,8 @@ def snapshot_attached_here(session, instance, vm_ref, label):
def _create_snapshot(session, instance, vm_ref, label):
"""Creates Snapshot (Template) VM, Snapshot VBD, Snapshot VDI,
- Snapshot VHD"""
- LOG.debug(_("Snapshotting with label '%(label)s'"), locals(),
- instance=instance)
-
+ Snapshot VHD
+ """
vm_vdi_ref, vm_vdi_rec = get_vdi_for_vm_safely(session, vm_ref)
original_parent_uuid = _get_vhd_parent_uuid(session, vm_vdi_ref)
@@ -499,8 +497,8 @@ def _create_snapshot(session, instance, vm_ref, label):
template_vdi_rec = get_vdi_for_vm_safely(session, template_vm_ref)[1]
template_vdi_uuid = template_vdi_rec["uuid"]
- LOG.debug(_('Created snapshot %(template_vm_ref)s'), locals(),
- instance=instance)
+ LOG.debug(_("Created snapshot %(template_vdi_uuid)s with label"
+ " '%(label)s'"), locals(), instance=instance)
sr_ref = vm_vdi_rec["SR"]
parent_uuid, base_uuid = _wait_for_vhd_coalesce(