openstack/deb-nova
Code Issues Proposed changes

Merge "xenapi: Make _connect_volume exc handler eventlet safe"

Browse Source
This commit is contained in:
Jenkins
2013-04-16 18:23:18 +00:00
committed by Gerrit Code Review
parent 36b1038472 a2a9f16889
commit 964df95013
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/virt/xenapi/volumeops.py
View File

@@ -20,6 +20,7 @@ Management class for Storage-related functions (attach, detach, etc).
""" """
from nova import exception from nova import exception
from nova.openstack.common import excutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.virt.xenapi import vm_utils from nova.virt.xenapi import vm_utils
from nova.virt.xenapi import volume_utils from nova.virt.xenapi import volume_utils
@@ -92,10 +93,11 @@ class VolumeOps(object):
if hotplug: if hotplug:
self._session.call_xenapi("VBD.plug", vbd_ref) self._session.call_xenapi("VBD.plug", vbd_ref)
except Exception: except Exception:
# NOTE(sirp): Forgetting the SR will have the effect of cleaning up with excutils.save_and_reraise_exception():
# the VDI and VBD records, so no need to handle that explicitly. # NOTE(sirp): Forgetting the SR will have the effect of
# cleaning up the VDI and VBD records, so no need to handle
# that explicitly.
volume_utils.forget_sr(self._session, sr_ref) volume_utils.forget_sr(self._session, sr_ref)
raise
def detach_volume(self, connection_info, instance_name, mountpoint): def detach_volume(self, connection_info, instance_name, mountpoint):
"""Detach volume storage to VM instance.""" """Detach volume storage to VM instance."""