openstack
/
cinder
Code Issues Proposed changes

Remove unneeded arg from _clean_db (vol manager) 

The context arg is not used by this method.

Change-Id: Ie6dbec8b1a69c2180ac4f3812678d4837b4aac47
This commit is contained in:
Eric Harney 2020-07-01 16:10:10 -04:00
parent fdf7775f76
commit de8d05dffa
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cinder/volume/manager.py
View File

@ -882,7 +882,7 @@ class VolumeManager(manager.CleanableManager,
volume.id)
for s in snapshots:
if s.status != fields.SnapshotStatus.DELETING:
self._clear_db(context, is_migrating_dest, volume,
self._clear_db(is_migrating_dest, volume,
'error_deleting')
msg = (_("Snapshot %(id)s was found in state "
@ -902,8 +902,7 @@ class VolumeManager(manager.CleanableManager,
resource=volume)
# If this is a destination volume, we have to clear the database
# record to avoid user confusion.
self._clear_db(context, is_migrating_dest, volume,
'available')
self._clear_db(is_migrating_dest, volume, 'available')
return
except Exception:
with excutils.save_and_reraise_exception():
@ -913,8 +912,7 @@ class VolumeManager(manager.CleanableManager,
if unmanage_only is True:
new_status = 'error_unmanaging'
self._clear_db(context, is_migrating_dest, volume,
new_status)
self._clear_db(is_migrating_dest, volume, new_status)
# If deleting source/destination volume in a migration or a temp
# volume for backup, we should skip quotas.
@ -958,7 +956,7 @@ class VolumeManager(manager.CleanableManager,
msg = "Unmanaged volume successfully."
LOG.info(msg, resource=volume)
def _clear_db(self, context, is_migrating_dest, volume_ref, status):
def _clear_db(self, is_migrating_dest, volume_ref, status):
# This method is called when driver.unmanage() or
# driver.delete_volume() fails in delete_volume(), so it is already
# in the exception handling part.