diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-06-01 17:49:49 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-06-01 17:49:49 -0700 |
| commit | e0d2dde5d370d76cd8ff55e47dbbf749be43a4c9 (patch) | |
| tree | 9088f430aa5946c47273aceb3dc00d2b91760a26 /nova/scheduler | |
| parent | cf464dc7f2093ea3d1f831915ce22f54f0d1c90a (diff) | |
tests all passing again
Diffstat (limited to 'nova/scheduler')
| -rw-r--r-- | nova/scheduler/api.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nova/scheduler/api.py b/nova/scheduler/api.py index 0f423655e..432f22b90 100644 --- a/nova/scheduler/api.py +++ b/nova/scheduler/api.py @@ -148,10 +148,7 @@ def call_zone_method(context, method_name, errors_to_ignore=None, except Exception as e: if type(e) in errors_to_ignore: return None - # TODO (dabo) - want to be able to re-raise here. - # Returning a string now; raising was causing issues. - # raise e - return "ERROR", "%s" % e + raise e res = pool.spawn(_error_trap, *args, **kwargs) results.append((zone, res)) |