diff options
| author | Rick Harris <rconradharris@gmail.com> | 2011-10-10 17:58:56 -0500 |
|---|---|---|
| committer | Rick Harris <rconradharris@gmail.com> | 2011-10-13 18:46:38 -0500 |
| commit | 46d04831f5c290a40c14da415169749e2ef41383 (patch) | |
| tree | f3d20cf687ff074e719b861ab871bdc73c204e3f /nova/compute | |
| parent | 56be39aedb195576179e73c859db2271a9585496 (diff) | |
Xenapi driver can now generate swap from instance_type
Change-Id: I50268a85ccd62b019436a207c2b52b1901597564
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 10 |
1 files changed, 1 insertions, 9 deletions
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): |