openstack
/
trove
Code Issues Proposed changes

Delete error volumes when deleting instance 

Backport candidate.

Change-Id: I799f7b30e1af396a8ae540cff2ba8b548a23f82c
Story: 2007436
Task: 39083
This commit is contained in:
Lingxian Kong 2020-03-17 14:20:52 +13:00
parent c952838a9b
commit 513e0dd3cd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trove/instance/models.py
View File

@ -789,7 +789,9 @@ class BaseInstance(SimpleInstance):
try:
if self.volume_id:
volume = self.volume_client.volumes.get(self.volume_id)
if volume.status == "available":
if volume.status in ["available", "error"]:
LOG.info("Deleting volume %s for instance %s",
self.volume_id, self.id)
volume.delete()
except Exception as e:
LOG.warning("Failed to delete volume for instance %s, error: %s",