Skip to content

Commit

Permalink
Fix volume_glance_metadata deletion
Browse files Browse the repository at this point in the history
If volume_glance_metadata does not exist for a certain volume,
it returns an exception and does not delete volume from db.
Avoid deleting it if it does not exist.

Bug: 1209367
Change-Id: Ia607ec5ecfc115c1a593f14236ee93158938a8da
  • Loading branch information
Adalberto Medeiros committed Aug 20, 2013
1 parent fc705de commit 8b35b1d
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion cinder/volume/manager.py
Expand Up @@ -258,7 +258,15 @@ def delete_volume(self, context, volume_id):
reservations = None
LOG.exception(_("Failed to update usages deleting volume"))

self.db.volume_glance_metadata_delete_by_volume(context, volume_id)
# Delete glance metadata if it exists
try:
self.db.volume_glance_metadata_delete_by_volume(context, volume_id)
LOG.debug(_("volume %s: glance metadata deleted"),
volume_ref['id'])
except exception.GlanceMetadataNotFound:
LOG.debug(_("no glance metadata found for volume %s"),
volume_ref['id'])

self.db.volume_destroy(context, volume_id)
LOG.info(_("volume %s: deleted successfully"), volume_ref['id'])
self._notify_about_volume_usage(context, volume_ref, "delete.end")
Expand Down

0 comments on commit 8b35b1d

Please sign in to comment.