Merge lp:~vishvananda/nova/log-metadata-exception into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Logs the exception if metadata fails and returns a 500 with an error message to the client.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Brian Waldon (bcwaldon)]

Pretty straightforward, but would you mind rewriting lines 21-26 to return a webob.exc.HTTPInternalServerError response? This would keep in line with the rest of the project returning things like HTTPNotFound rather than a generic webob.Response with status set to 404.

review: Needs Information

[Vish Ishaya (vishvananda)]

> Pretty straightforward, but would you mind rewriting lines 21-26 to return a
> webob.exc.HTTPInternalServerError response? This would keep in line with the
> rest of the project returning things like HTTPNotFound rather than a generic
> webob.Response with status set to 404.

done

[lp:~vishvananda/nova/log-metadata-exception]

1089. By Vish Ishaya on 2011-05-31

switch to using webob exception

[Brian Waldon (bcwaldon)]

One last pep8 violation, then you're in.

review: Needs Fixing

[lp:~vishvananda/nova/log-metadata-exception]

1090. By Vish Ishaya on 2011-05-31

pep8

[Vish Ishaya (vishvananda)]

Fixed
On May 31, 2011, at 3:01 PM, Brian Waldon wrote:

> Review: Needs Fixing
> One last pep8 violation, then you're in.
> --
> https://code.launchpad.net/~vishvananda/nova/log-metadata-exception/+merge/61480
> You are the owner of lp:~vishvananda/nova/log-metadata-exception.

[Brian Waldon (bcwaldon)]

Excellent.

review: Approve

=== modified file 'nova/api/ec2/metadatarequesthandler.py'
--- nova/api/ec2/metadatarequesthandler.py	2011-03-03 16:04:33 +0000
+++ nova/api/ec2/metadatarequesthandler.py	2011-05-31 22:52:26 +0000
@@ -23,6 +23,7 @@
 
 from nova import log as logging
 from nova import flags
+from nova import utils
 from nova import wsgi
 from nova.api.ec2 import cloud
 
@@ -71,7 +72,15 @@
         remote_address = req.remote_addr
         if FLAGS.use_forwarded_for:
             remote_address = req.headers.get('X-Forwarded-For', remote_address)
-        meta_data = cc.get_metadata(remote_address)
+        try:
+            meta_data = cc.get_metadata(remote_address)
+        except Exception:
+            LOG.exception(_('Failed to get metadata for ip: %s'),
+                          remote_address)
+            msg = _('An unknown error has occurred. '
+                    'Please try your request again.')
+            exc = webob.exc.HTTPInternalServerError(explanation=unicode(msg))
+            return exc
         if meta_data is None:
             LOG.error(_('Failed to get metadata for ip: %s'), remote_address)
             raise webob.exc.HTTPNotFound()