diff options
| author | Julien Danjou <julien.danjou@enovance.com> | 2012-03-22 16:42:05 +0100 |
|---|---|---|
| committer | Julien Danjou <julien.danjou@enovance.com> | 2012-03-22 17:49:13 +0100 |
| commit | 9d328628dea9530de629f829faa569fd87e0ac90 (patch) | |
| tree | ac46f1d58ad04e3880a245c50e8dd7c503906f0d /nova/api | |
| parent | 298aac4bbf69c3c208673dbebb30c3e24396c3ca (diff) | |
Handle correctly QuotaError in EC2 API
Without this patch, EC2 API returns UnknownError when quota is exceeded, see bug #853381
This patch fixes that by handling the exception. Now euca-run-instances returns useful information:
$ euca-run-instances --instance-count 10 --instance-type m1.8gb.2cpus.diskless ami-00000012
QuotaError: Quota exceeded: code=InstanceLimitExceeded
Change-Id: I1f7b381b34d2f538b7cc2d9582a40fd8bf88fbc3
Signed-off-by: Julien Danjou <julien@danjou.info>
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index cfa7e91be..17759015f 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -629,6 +629,10 @@ class Executor(wsgi.Application): LOG.debug(_('InvalidRequest raised: %s'), unicode(ex), context=context) return ec2_error(req, request_id, type(ex).__name__, unicode(ex)) + except exception.QuotaError as ex: + LOG.debug(_('QuotaError raised: %s'), unicode(ex), + context=context) + return ec2_error(req, request_id, type(ex).__name__, unicode(ex)) except exception.InvalidInstanceIDMalformed as ex: LOG.debug(_('ValidatorError raised: %s'), unicode(ex), context=context) |