From 6601f5f2887e6e4205c21418a11ae38eefc14840 Mon Sep 17 00:00:00 2001 From: bhagyashris Date: Mon, 1 Aug 2016 19:49:46 +0530 Subject: [PATCH] Remove unused context parameter Context parameter is removed from cinder methods which are not using it at all. Closes-Bug: #1610152 Change-Id: I6f1797ecee57333c14b5878f1b4497f55a077414 --- cinder/backup/chunkeddriver.py | 4 +-- cinder/backup/manager.py | 30 +++++++++----------- cinder/scheduler/flows/create_volume.py | 4 +-- cinder/volume/flows/manager/create_volume.py | 4 +-- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/cinder/backup/chunkeddriver.py b/cinder/backup/chunkeddriver.py index 20230532d1b..595986ace8e 100644 --- a/cinder/backup/chunkeddriver.py +++ b/cinder/backup/chunkeddriver.py @@ -159,7 +159,7 @@ class ChunkedBackupDriver(driver.BackupDriver): """ return - def _create_container(self, context, backup): + def _create_container(self, backup): # Container's name will be decided by the driver (returned by method # update_container_name), if no change is required by the driver then # we'll use the one the backup object already has, but if it doesn't @@ -280,7 +280,7 @@ class ChunkedBackupDriver(driver.BackupDriver): err = _('volume size %d is invalid.') % volume['size'] raise exception.InvalidVolume(reason=err) - container = self._create_container(self.context, backup) + container = self._create_container(backup) object_prefix = self._generate_object_name_prefix(backup) backup.service_metadata = object_prefix diff --git a/cinder/backup/manager.py b/cinder/backup/manager.py index 86b5243e6f8..534e0462404 100644 --- a/cinder/backup/manager.py +++ b/cinder/backup/manager.py @@ -200,7 +200,7 @@ class BackupManager(manager.SchedulerDependentManager): return mapper[service] return service - def _update_backup_error(self, backup, context, err): + def _update_backup_error(self, backup, err): backup.status = fields.BackupStatus.ERROR backup.fail_reason = err backup.save() @@ -269,7 +269,7 @@ class BackupManager(manager.SchedulerDependentManager): self._cleanup_one_volume(ctxt, volume) err = 'incomplete backup reset on manager restart' - self._update_backup_error(backup, ctxt, err) + self._update_backup_error(backup, err) elif backup['status'] == fields.BackupStatus.RESTORING: LOG.info(_LI('Resetting backup %s to ' 'available (was restoring).'), @@ -381,7 +381,7 @@ class BackupManager(manager.SchedulerDependentManager): 'expected_status': expected_status, 'actual_status': actual_status, } - self._update_backup_error(backup, context, err) + self._update_backup_error(backup, err) raise exception.InvalidVolume(reason=err) expected_status = fields.BackupStatus.CREATING @@ -392,7 +392,7 @@ class BackupManager(manager.SchedulerDependentManager): 'expected_status': expected_status, 'actual_status': actual_status, } - self._update_backup_error(backup, context, err) + self._update_backup_error(backup, err) backup.save() raise exception.InvalidBackup(reason=err) @@ -403,7 +403,7 @@ class BackupManager(manager.SchedulerDependentManager): self.db.volume_update(context, volume_id, {'status': previous_status, 'previous_status': 'error_backing-up'}) - self._update_backup_error(backup, context, six.text_type(err)) + self._update_backup_error(backup, six.text_type(err)) # Restore the original status. self.db.volume_update(context, volume_id, @@ -487,7 +487,7 @@ class BackupManager(manager.SchedulerDependentManager): '%(expected_status)s but got %(actual_status)s.') % {'expected_status': expected_status, 'actual_status': actual_status}) - self._update_backup_error(backup, context, err) + self._update_backup_error(backup, err) self.db.volume_update(context, volume_id, {'status': 'error'}) raise exception.InvalidBackup(reason=err) @@ -572,7 +572,7 @@ class BackupManager(manager.SchedulerDependentManager): '%(expected_status)s but got %(actual_status)s.') \ % {'expected_status': expected_status, 'actual_status': actual_status} - self._update_backup_error(backup, context, err) + self._update_backup_error(backup, err) raise exception.InvalidBackup(reason=err) backup_service = self._map_service_to_driver(backup['service']) @@ -585,7 +585,7 @@ class BackupManager(manager.SchedulerDependentManager): ' backup [%(backup_service)s].')\ % {'configured_service': configured_service, 'backup_service': backup_service} - self._update_backup_error(backup, context, err) + self._update_backup_error(backup, err) raise exception.InvalidBackup(reason=err) try: @@ -593,8 +593,7 @@ class BackupManager(manager.SchedulerDependentManager): backup_service.delete(backup) except Exception as err: with excutils.save_and_reraise_exception(): - self._update_backup_error(backup, context, - six.text_type(err)) + self._update_backup_error(backup, six.text_type(err)) # Get reservations try: @@ -721,7 +720,7 @@ class BackupManager(manager.SchedulerDependentManager): err = _('Import record failed, cannot find backup ' 'service to perform the import. Request service ' '%(service)s') % {'service': backup_service} - self._update_backup_error(backup, context, err) + self._update_backup_error(backup, err) raise exception.ServiceNotFound(service_id=backup_service) else: # Yes... @@ -735,7 +734,7 @@ class BackupManager(manager.SchedulerDependentManager): backup_service.import_record(backup, driver_options) except Exception as err: msg = six.text_type(err) - self._update_backup_error(backup, context, msg) + self._update_backup_error(backup, msg) raise exception.InvalidBackup(reason=msg) required_import_options = { @@ -755,7 +754,7 @@ class BackupManager(manager.SchedulerDependentManager): msg = (_('Driver successfully decoded imported backup data, ' 'but there are missing fields (%s).') % ', '.join(missing_opts)) - self._update_backup_error(backup, context, msg) + self._update_backup_error(backup, msg) raise exception.InvalidBackup(reason=msg) # Confirm the ID from the record in the DB is the right one @@ -764,7 +763,7 @@ class BackupManager(manager.SchedulerDependentManager): msg = (_('Trying to import backup metadata from id %(meta_id)s' ' into backup %(id)s.') % {'meta_id': backup_id, 'id': backup.id}) - self._update_backup_error(backup, context, msg) + self._update_backup_error(backup, msg) raise exception.InvalidBackup(reason=msg) # Overwrite some fields @@ -794,8 +793,7 @@ class BackupManager(manager.SchedulerDependentManager): 'id': backup.id}) except exception.InvalidBackup as err: with excutils.save_and_reraise_exception(): - self._update_backup_error(backup, context, - six.text_type(err)) + self._update_backup_error(backup, six.text_type(err)) LOG.info(_LI('Import record id %s metadata from driver ' 'finished.'), backup.id) diff --git a/cinder/scheduler/flows/create_volume.py b/cinder/scheduler/flows/create_volume.py index 2a879755702..b10fecf902f 100644 --- a/cinder/scheduler/flows/create_volume.py +++ b/cinder/scheduler/flows/create_volume.py @@ -43,7 +43,7 @@ class ExtractSchedulerSpecTask(flow_utils.CinderTask): **kwargs) self.db_api = db_api - def _populate_request_spec(self, context, volume, snapshot_id, + def _populate_request_spec(self, volume, snapshot_id, image_id): # Create the full request spec using the volume object. # @@ -69,7 +69,7 @@ class ExtractSchedulerSpecTask(flow_utils.CinderTask): image_id): # For RPC version < 1.2 backward compatibility if request_spec is None: - request_spec = self._populate_request_spec(context, volume.id, + request_spec = self._populate_request_spec(volume.id, snapshot_id, image_id) return { 'request_spec': request_spec, diff --git a/cinder/volume/flows/manager/create_volume.py b/cinder/volume/flows/manager/create_volume.py index d301bab2552..033e8f4e68f 100644 --- a/cinder/volume/flows/manager/create_volume.py +++ b/cinder/volume/flows/manager/create_volume.py @@ -92,7 +92,7 @@ class OnFailureRescheduleTask(flow_utils.CinderTask): def execute(self, **kwargs): pass - def _pre_reschedule(self, context, volume): + def _pre_reschedule(self, volume): """Actions that happen before the rescheduling attempt occur here.""" try: @@ -179,7 +179,7 @@ class OnFailureRescheduleTask(flow_utils.CinderTask): cause = list(flow_failures.values())[0] context = self.reschedule_context try: - self._pre_reschedule(context, volume_ref) + self._pre_reschedule(volume_ref) self._reschedule(context, cause, volume=volume_ref, **kwargs) self._post_reschedule(volume_ref) return True