openstack/cinder
Code Issues Proposed changes

Fix encryption key deletion error handling on volume delete

Browse Source 
e.msg is only present for CinderExceptions, not all exception
types.

Closes-Bug: #1681874

Change-Id: I02601ae2a9ba95ab7145b86e24a094272f4cfbf6
This commit is contained in:
Eric Harney
2017-04-11 11:25:09 -04:00
parent 3ecfc460b3
commit 6e2d8fd066
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/volume/api.py
View File

@@ -467,9 +467,12 @@ class API(base.Base):
if encryption_key_id is not None: if encryption_key_id is not None:
try: try:
self.key_manager.delete(context, encryption_key_id) self.key_manager.delete(context, encryption_key_id)
except Exception as e: except exception.CinderException as e:
LOG.warning("Unable to delete encryption key for " LOG.warning("Unable to delete encryption key for "
"volume: %s.", e.msg, resource=volume) "volume: %s.", e.msg, resource=volume)
except Exception:
LOG.exception("Unable to delete encryption key for "
"volume.")
self.volume_rpcapi.delete_volume(context, self.volume_rpcapi.delete_volume(context,
volume, volume,