Merge lp:~johannes.erdfelt/nova/lp822748 into lp:~hudson-openstack/nova/trunk

[Johannes Erdfelt]

nova.exception.wrap_exception will re-raise some exceptions, but in the process of possibly notifying that an exception has occurred, it may clobber the current exception information. nova.utils.to_primitive in particular (used by the notifier code) will catch and handle an exception clobbering the current exception being handled in wrap_exception. Eventually when using the bare 'raise', it will attempt to raise None resulting a completely different and unhelpful exception.

The patch saves the exception at the beginning of wrap_exception and then re-raises the original exception avoiding the possibility of a clobbered exception.

[Josh Kearney (jk0)]

LGTM

review: Approve

[Sandy Walsh (sandy-walsh)]

Ah, I see now what was happening. Good catch.

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~johannes.erdfelt/nova/lp822748 into lp:nova failed. Below is the output from the failed tests.

FloatingIpTest
    test_floating_ip_allocate OK 0.15
    test_floating_ip_associate OK 0.09
    test_floating_ip_disassociate OK 0.10
    test_floating_ip_release OK 0.09
    test_floating_ip_show OK 0.09
    test_floating_ips_list OK 0.08
    test_translate_floating_ip_view OK 0.04
    test_translate_floating_ip_view_dict OK 0.02
FixedIpTest
    test_add_fixed_ip OK 0.20
    test_add_fixed_ip_no_network OK 0.06
    test_remove_fixed_ip OK 0.06
    test_remove_fixed_ip_no_address OK 0.07
AccountsTest
    test_account_create OK 0.16
    test_account_delete OK 0.15
    test_account_update OK 0.32
    test_get_account OK 0.15
AdminAPITest
    test_admin_disabled OK 0.12
    test_admin_enabled OK 0.15
APITest
    test_exceptions_are_converted_to_faults OK 0.01
    test_malformed_json OK 0.05
    test_malformed_xml OK 0.06
Test
    test_authorize_project OK 0.24
    test_authorize_token OK 0.09
    test_authorize_user OK 0.05
    test_bad_project OK 0.10
    test_bad_token OK 0.05
    test_bad_user_bad_key OK 0.06
    test_bad_user_good_key OK 0.06
    test_no_user OK 0.06
    test_not_existing_project OK 0.21
    test_token_expiry OK 0.05
TestFunctional
    test_token_doesnotexist OK 0.06
    test_token_expiry OK 0.08
TestLimiter
    test_authorize_token OK 0.09
LimiterTest
    test_limiter_custom_max_limit OK 0.00
    test_limiter_limit_and_offset OK 0.00
    test_limiter_limit_medium OK 0.00
    test_limiter_limit_over_max OK 0.00
    test_limiter_limit_zero OK 0.00
    test_limiter_negative_limit OK 0.00
    test_limiter_negative_offset ...

[lp:~johannes.erdfelt/nova/lp822748]

1394. By Johannes Erdfelt on 2011-08-08

Import sys as well

=== modified file 'nova/exception.py'
--- nova/exception.py	2011-08-05 15:59:14 +0000
+++ nova/exception.py	2011-08-08 19:31:32 +0000
@@ -25,6 +25,7 @@
 """
 
 from functools import wraps
+import sys
 
 from nova import log as logging
 
@@ -96,6 +97,10 @@
             try:
                 return f(*args, **kw)
             except Exception, e:
+                # Save exception since it can be clobbered during processing
+                # below before we can re-raise
+                exc_info = sys.exc_info()
+
                 if notifier:
                     payload = dict(args=args, exception=e)
                     payload.update(kw)
@@ -122,7 +127,9 @@
                     LOG.exception(_('Uncaught exception'))
                     #logging.error(traceback.extract_stack(exc_traceback))
                     raise Error(str(e))
-                raise
+
+                # re-raise original exception since it may have been clobbered
+                raise exc_info[0], exc_info[1], exc_info[2]
 
         return wraps(f)(wrapped)
     return inner