Catch more exception in force_cleanup

Change-Id: I9010739b397b0cf737e796b1c96e379f8d582fbc
This commit is contained in:
ahothan 2016-09-20 16:41:16 -07:00
parent 83ee923096
commit 8afceddbe6
2 changed files with 5 additions and 2 deletions

View File

@ -209,7 +209,10 @@ class StorageCleaner(AbstractCleaner):
# finally delete the volumes
for vol in kb_volumes:
if not self.dryrun:
vol.force_delete()
try:
vol.force_delete()
except cinderclient.exceptions.BadRequest as exc:
print str(exc)
self.report_deletion('VOLUME', vol.name)
except KeyError:
pass

View File

@ -72,7 +72,7 @@ class KBRunner_Storage(KBRunner):
def init_volume(self, active_range):
# timeout is calculated as 30s/GB/client VM
timeout = 30 * self.config.storage_stage_configs.io_file_size * len(self.client_dict)
timeout = 60 * self.config.storage_stage_configs.io_file_size * len(self.client_dict)
parameter = {'size': str(self.config.storage_stage_configs.io_file_size) + 'GiB'}
parameter['mkfs'] = True \
if self.config.storage_stage_configs.target == 'volume' else False