From 46d04831f5c290a40c14da415169749e2ef41383 Mon Sep 17 00:00:00 2001 From: Rick Harris Date: Mon, 10 Oct 2011 17:58:56 -0500 Subject: Xenapi driver can now generate swap from instance_type Change-Id: I50268a85ccd62b019436a207c2b52b1901597564 --- nova/compute/manager.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index f4cad6180..686c9f1ed 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -465,16 +465,8 @@ class ComputeManager(manager.SchedulerDependentManager): # be fixed once we have no-db-messaging pass except: - # NOTE(sirp): 3-arg raise needed since Eventlet clears exceptions - # when switching between greenthreads. - type_, value, traceback = sys.exc_info() - try: + with utils.original_exception_raised(): _deallocate_network() - finally: - # FIXME(sirp): when/if - # https://github.com/jcrocholl/pep8/pull/27 merges, we can add - # a per-line disable flag here for W602 - raise type_, value, traceback @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) def run_instance(self, context, instance_id, **kwargs): -- cgit