Merge lp:~tpatil/nova/bug709510 into lp:~hudson-openstack/nova/trunk

[Tushar Patil]

Fix for LP Bug #709510

coerce the exceptions to unicode.

This will work in python 2.x but will fail in python 3.x because unicode function is not supported in 3.x. By default all string are unicode string. When python 3.x will be supported bby nova at that time we will need to port and replace from unicode() to str() again.

[Devin Carlen (devcamcar)]

Seems like this is getting changed back and forth from ex.args[0] to ex. Do we have any kind of consensus here?

review: Needs Information

[Tushar Patil (tpatil)]

When LP Bug #699654 was fixed at that time itself it should have fixed/reviewed in the right manner. But that didn't happen.

Thanks to Vishy for pointing out the correct way of fixing this problem.

[Devin Carlen (devcamcar)]

Good and thanks for reference. Just wanted to make sure we're on the same page.

lgtm

review: Approve

[Thierry Carrez (ttx)]

Looks good to me, if this can get reviewed/merged today.

review: Approve (gfe)

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

=== modified file 'nova/api/ec2/__init__.py'
--- nova/api/ec2/__init__.py	2011-01-27 22:10:42 +0000
+++ nova/api/ec2/__init__.py	2011-01-31 22:55:55 +0000
@@ -171,7 +171,7 @@
                     req.path)
         # Be explicit for what exceptions are 403, the rest bubble as 500
         except (exception.NotFound, exception.NotAuthorized) as ex:
-            LOG.audit(_("Authentication Failure: %s"), ex.args[0])
+            LOG.audit(_("Authentication Failure: %s"), unicode(ex))
             raise webob.exc.HTTPForbidden()
 
         # Authenticated!
@@ -316,30 +316,31 @@
         try:
             result = api_request.invoke(context)
         except exception.InstanceNotFound as ex:
-            LOG.info(_('InstanceNotFound raised: %s'), ex.args[0],
+            LOG.info(_('InstanceNotFound raised: %s'), unicode(ex),
                      context=context)
             ec2_id = cloud.id_to_ec2_id(ex.instance_id)
             message = _('Instance %s not found') % ec2_id
             return self._error(req, context, type(ex).__name__, message)
         except exception.VolumeNotFound as ex:
-            LOG.info(_('VolumeNotFound raised: %s'), ex.args[0],
+            LOG.info(_('VolumeNotFound raised: %s'), unicode(ex),
                      context=context)
             ec2_id = cloud.id_to_ec2_id(ex.volume_id, 'vol-%08x')
             message = _('Volume %s not found') % ec2_id
             return self._error(req, context, type(ex).__name__, message)
         except exception.NotFound as ex:
-            LOG.info(_('NotFound raised: %s'), ex.args[0], context=context)
-            return self._error(req, context, type(ex).__name__, ex.args[0])
+            LOG.info(_('NotFound raised: %s'), unicode(ex), context=context)
+            return self._error(req, context, type(ex).__name__, unicode(ex))
         except exception.ApiError as ex:
-            LOG.exception(_('ApiError raised: %s'), ex.args[0],
+            LOG.exception(_('ApiError raised: %s'), unicode(ex),
                           context=context)
             if ex.code:
-                return self._error(req, context, ex.code, ex.args[0])
+                return self._error(req, context, ex.code, unicode(ex))
             else:
-                return self._error(req, context, type(ex).__name__, ex.args[0])
+                return self._error(req, context, type(ex).__name__,
+                                   unicode(ex))
         except Exception as ex:
             extra = {'environment': req.environ}
-            LOG.exception(_('Unexpected error raised: %s'), ex.args[0],
+            LOG.exception(_('Unexpected error raised: %s'), unicode(ex),
                           extra=extra, context=context)
             return self._error(req,
                                context,

=== modified file 'nova/api/openstack/__init__.py'
--- nova/api/openstack/__init__.py	2011-01-22 21:20:09 +0000
+++ nova/api/openstack/__init__.py	2011-01-31 22:55:55 +0000
@@ -51,8 +51,8 @@
         try:
             return req.get_response(self.application)
         except Exception as ex:
-            LOG.exception(_("Caught error: %s"), str(ex))
-            exc = webob.exc.HTTPInternalServerError(explanation=str(ex))
+            LOG.exception(_("Caught error: %s"), unicode(ex))
+            exc = webob.exc.HTTPInternalServerError(explanation=unicode(ex))
             return faults.Fault(exc)