From ef42fa95197e7b0f73e04322456bbbdedaf3e2b3 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 18 May 2011 14:15:36 -0700
Subject: log any exceptions that get thrown trying to retrieve metadata

---
 nova/api/ec2/metadatarequesthandler.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nova/api/ec2/metadatarequesthandler.py b/nova/api/ec2/metadatarequesthandler.py
index 28f99b0ef..481e34e12 100644
--- a/nova/api/ec2/metadatarequesthandler.py
+++ b/nova/api/ec2/metadatarequesthandler.py
@@ -71,7 +71,11 @@ class MetadataRequestHandler(wsgi.Application):
         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)
+            raise
         if meta_data is None:
             LOG.error(_('Failed to get metadata for ip: %s'), remote_address)
             raise webob.exc.HTTPNotFound()
-- 
cgit 


From 38ba122d9eb67c699ea0c10eab5961c3b4c25d81 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 18 May 2011 14:23:09 -0700
Subject: use a manual 500 with error text instead of traceback for failure

---
 nova/api/ec2/metadatarequesthandler.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nova/api/ec2/metadatarequesthandler.py b/nova/api/ec2/metadatarequesthandler.py
index 481e34e12..720f264a4 100644
--- a/nova/api/ec2/metadatarequesthandler.py
+++ b/nova/api/ec2/metadatarequesthandler.py
@@ -23,6 +23,7 @@ import webob.exc
 
 from nova import log as logging
 from nova import flags
+from nova import utils
 from nova import wsgi
 from nova.api.ec2 import cloud
 
@@ -75,7 +76,12 @@ class MetadataRequestHandler(wsgi.Application):
             meta_data = cc.get_metadata(remote_address)
         except Exception:
             LOG.exception(_('Failed to get metadata for ip: %s'), remote_address)
-            raise
+            resp = webob.Response()
+            resp.status = 500
+            message = _('An unknown error has occurred. '
+                        'Please try your request again.')
+            resp.body = str(utils.utf8(message))
+            return resp
         if meta_data is None:
             LOG.error(_('Failed to get metadata for ip: %s'), remote_address)
             raise webob.exc.HTTPNotFound()
-- 
cgit 


From b0c43e57ad6a7e5be8a749e70da39b7f7ba547bd Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Tue, 31 May 2011 14:49:47 -0700
Subject: switch to using webob exception

---
 nova/api/ec2/metadatarequesthandler.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nova/api/ec2/metadatarequesthandler.py b/nova/api/ec2/metadatarequesthandler.py
index 720f264a4..9c8e52270 100644
--- a/nova/api/ec2/metadatarequesthandler.py
+++ b/nova/api/ec2/metadatarequesthandler.py
@@ -76,12 +76,10 @@ class MetadataRequestHandler(wsgi.Application):
             meta_data = cc.get_metadata(remote_address)
         except Exception:
             LOG.exception(_('Failed to get metadata for ip: %s'), remote_address)
-            resp = webob.Response()
-            resp.status = 500
-            message = _('An unknown error has occurred. '
-                        'Please try your request again.')
-            resp.body = str(utils.utf8(message))
-            return resp
+            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()
-- 
cgit 


From 81f40ed1ca284bc9a8ee948ae23fdff93d632cb0 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Tue, 31 May 2011 15:50:33 -0700
Subject: pep8

---
 nova/api/ec2/metadatarequesthandler.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nova/api/ec2/metadatarequesthandler.py b/nova/api/ec2/metadatarequesthandler.py
index 9c8e52270..b70266a20 100644
--- a/nova/api/ec2/metadatarequesthandler.py
+++ b/nova/api/ec2/metadatarequesthandler.py
@@ -75,7 +75,8 @@ class MetadataRequestHandler(wsgi.Application):
         try:
             meta_data = cc.get_metadata(remote_address)
         except Exception:
-            LOG.exception(_('Failed to get metadata for ip: %s'), remote_address)
+            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))
-- 
cgit