diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2012-04-24 16:12:08 -0400 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2012-04-25 10:08:13 -0400 |
| commit | 22dd8749304f09026e28362eaac613cc35c1038b (patch) | |
| tree | 6c667981d4b75f2a5ccd034335b011dc34e64791 | |
| parent | d813d20c3b996f90974a3c02aa658b97df9f7607 (diff) | |
| download | nova-22dd8749304f09026e28362eaac613cc35c1038b.tar.gz nova-22dd8749304f09026e28362eaac613cc35c1038b.tar.xz nova-22dd8749304f09026e28362eaac613cc35c1038b.zip | |
Small cleanup to attach_volume logging
Change-Id: I92b044b0b56ab7385ee423df38a08bd657feaed5
| -rw-r--r-- | nova/compute/manager.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index ea32af980..e6653035e 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1690,8 +1690,6 @@ class ComputeManager(manager.SchedulerDependentManager): context = context.elevated() instance_ref = self.db.instance_get_by_uuid(context, instance_uuid) instance_id = instance_ref['id'] - msg = _("instance %(instance_uuid)s: attaching volume %(volume_id)s" - " to %(mountpoint)s") LOG.audit(_('Attaching volume %(volume_id)s to %(mountpoint)s'), locals(), context=context, instance=instance_ref) try: @@ -1701,8 +1699,8 @@ class ComputeManager(manager.SchedulerDependentManager): connector) except Exception: # pylint: disable=W0702 with utils.save_and_reraise_exception(): - msg = _("instance %(instance_uuid)s: attach failed" - " %(mountpoint)s, removing") + msg = _("Failed to connect to volume %(volume_id)s " + "while attaching at %(mountpoint)s") LOG.exception(msg % locals(), context=context, instance=instance_ref) self.volume_api.unreserve_volume(context, volume) @@ -1712,8 +1710,9 @@ class ComputeManager(manager.SchedulerDependentManager): mountpoint) except Exception: # pylint: disable=W0702 with utils.save_and_reraise_exception(): - LOG.exception(_('Attach failed %(mountpoint)s, removing'), - locals(), context=context, + msg = _("Failed to attach volume %(volume_id)s " + "at %(mountpoint)s") + LOG.exception(msg % locals(), context=context, instance=instance_ref) self.volume_api.terminate_connection(context, volume, |