Exception rendering errors

[Mate Lakat]

Some new errors were introduced here:
https://review.openstack.org/#/c/20514/

See my comments inline.

The specific traces:

Traceback (most recent call last):
File "/opt/stack/cinder/cinder/openstack/common/rpc/amqp.py", line 275, in _process_data
rval = self.proxy.dispatch(ctxt, version, method, **args)
File "/opt/stack/cinder/cinder/openstack/common/rpc/dispatcher.py", line 145, in dispatch
return getattr(proxyobj, method)(ctxt, **kwargs)
File "/opt/stack/cinder/cinder/volume/manager.py", line 281, in create_volume
if image_id and not cloned:
UnboundLocalError: local variable 'cloned' referenced before assignment

And:
raceback (most recent call last):
File "/opt/stack/cinder/cinder/openstack/common/rpc/amqp.py", line 275, in _process_data
rval = self.proxy.dispatch(ctxt, version, method, **args)
File "/opt/stack/cinder/cinder/openstack/common/rpc/dispatcher.py", line 145, in dispatch
return getattr(proxyobj, method)(ctxt, **kwargs)
File "/opt/stack/cinder/cinder/volume/manager.py", line 273, in create_volume
volume_ref['id'], {'status': 'error'})
File "/usr/lib/python2.7/contextlib.py", line 24, in __exit__
self.gen.next()
File "/opt/stack/cinder/cinder/volume/manager.py", line 254, in create_volume
allow_reschedule)
File "/opt/stack/cinder/cinder/volume/manager.py", line 343, in _reschedule_or_reraise
self._log_original_error(exc_info, volume_id)
File "/opt/stack/cinder/cinder/volume/manager.py", line 313, in _log_original_error
volume_id=volume_id)
File "/usr/lib/python2.7/logging/__init__.py", line 1436, in error
self.logger.error(msg, *args, **kwargs)
File "/usr/lib/python2.7/logging/__init__.py", line 1166, in error
self._log(ERROR, msg, args, **kwargs)
TypeError: _log() got an unexpected keyword argument 'volume_id'

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/22433
Committed: http://github.com/openstack/cinder/commit/c3c31fcff7717e0112616902780d4c762bd66702
Submitter: Jenkins
Branch: master

commit c3c31fcff7717e0112616902780d4c762bd66702
Author: Mate Lakat <email address hidden>
Date: Wed Feb 20 15:34:05 2013 +0000

    Fix various exception paths

    Fixes bug 1130723

    Some bugs were introduced in https://review.openstack.org/#/c/20514/
    this patch fixes the discovered errors. It also removes volume_id
    parameters from error messages.

    Change-Id: I9ff75482fe2bc13dbb65e7d666035a13a19d5c98