diff --git a/trove/common/base_exception.py b/trove/common/base_exception.py index 961e1cc5b5..011131df90 100644 --- a/trove/common/base_exception.py +++ b/trove/common/base_exception.py @@ -121,9 +121,9 @@ class OpenstackException(Exception): try: self._error_string = self.message % kwargs - except Exception as e: + except Exception: if _FATAL_EXCEPTION_FORMAT_ERRORS: - raise e + raise else: # at least get the core message out if something happened self._error_string = self.message diff --git a/trove/extensions/security_group/models.py b/trove/extensions/security_group/models.py index c36c06d7b5..1d311319a1 100644 --- a/trove/extensions/security_group/models.py +++ b/trove/extensions/security_group/models.py @@ -66,9 +66,9 @@ class SecurityGroup(DatabaseModelBase): user=context.user, tenant_id=context.tenant) - except exception.SecurityGroupCreationError as e: + except exception.SecurityGroupCreationError: LOG.exception(_("Failed to create remote security group.")) - raise e + raise @classmethod def create_for_instance(cls, instance_id, context): @@ -163,9 +163,9 @@ class SecurityGroupRule(DatabaseModelBase): cidr=cidr, group_id=sec_group['id']) - except exception.SecurityGroupRuleCreationError as e: + except exception.SecurityGroupRuleCreationError: LOG.exception(_("Failed to create remote security group.")) - raise e + raise def get_security_group(self, tenant_id): return SecurityGroup.find_by(id=self.group_id, diff --git a/trove/guestagent/strategies/backup/experimental/couchbase_impl.py b/trove/guestagent/strategies/backup/experimental/couchbase_impl.py index 6884be05d8..2e7c46b295 100644 --- a/trove/guestagent/strategies/backup/experimental/couchbase_impl.py +++ b/trove/guestagent/strategies/backup/experimental/couchbase_impl.py @@ -95,14 +95,14 @@ class CbBackup(base.BackupRunner): operating_system.copy(system.pwd_file, system.COUCHBASE_DUMP_DIR, preserve=True, as_root=True) - except exception.ProcessExecutionError as p: - LOG.error(p) - raise p + except exception.ProcessExecutionError: + LOG.exception(_("Error during pre-backup phase.")) + raise def _run_post_backup(self): try: for cmd in self.post_backup_commands: utils.execute_with_timeout(*cmd) - except exception.ProcessExecutionError as p: - LOG.error(p) - raise p + except exception.ProcessExecutionError: + LOG.exception(_("Error during post-backup phase.")) + raise diff --git a/trove/guestagent/strategies/backup/experimental/db2_impl.py b/trove/guestagent/strategies/backup/experimental/db2_impl.py index db3ba6f00a..3fd1efbe15 100644 --- a/trove/guestagent/strategies/backup/experimental/db2_impl.py +++ b/trove/guestagent/strategies/backup/experimental/db2_impl.py @@ -62,10 +62,10 @@ class DB2Backup(base.BackupRunner): 'dbname': dbName, 'dir': DB2_BACKUP_DIR}) service.run_command(system.UNQUIESCE_DB2) - except exception.ProcessExecutionError as e: + except exception.ProcessExecutionError: LOG.debug("Caught exception when preparing the directory") self.cleanup() - raise e + raise @property def cmd(self): diff --git a/trove/guestagent/strategies/backup/experimental/mongo_impl.py b/trove/guestagent/strategies/backup/experimental/mongo_impl.py index 0a2202e62c..c363992669 100644 --- a/trove/guestagent/strategies/backup/experimental/mongo_impl.py +++ b/trove/guestagent/strategies/backup/experimental/mongo_impl.py @@ -70,10 +70,10 @@ class MongoDump(base.BackupRunner): run_as_root=True, root_helper='sudo', timeout=LARGE_TIMEOUT ) - except exception.ProcessExecutionError as e: + except exception.ProcessExecutionError: LOG.debug("Caught exception when creating the dump") self.cleanup() - raise e + raise @property def cmd(self): diff --git a/trove/guestagent/strategies/restore/experimental/couchbase_impl.py b/trove/guestagent/strategies/restore/experimental/couchbase_impl.py index e2aa7fa0c4..7898d3991e 100644 --- a/trove/guestagent/strategies/restore/experimental/couchbase_impl.py +++ b/trove/guestagent/strategies/restore/experimental/couchbase_impl.py @@ -45,9 +45,9 @@ class CbBackup(base.RestoreRunner): def pre_restore(self): try: operating_system.remove(system.COUCHBASE_DUMP_DIR, force=True) - except exception.ProcessExecutionError as p: - LOG.error(p) - raise p + except exception.ProcessExecutionError: + LOG.exception(_("Error during pre-restore phase.")) + raise def post_restore(self): try: diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py index 568a6fef27..f0a667ec68 100644 --- a/trove/taskmanager/models.py +++ b/trove/taskmanager/models.py @@ -1781,7 +1781,7 @@ class ResizeActionBase(object): self._assert_processes_are_ok() LOG.debug("Confirming nova action") self._confirm_nova_action() - except Exception as ex: + except Exception: LOG.exception(_("Exception during nova action.")) if need_to_revert: LOG.error(_("Reverting action for instance %s") % @@ -1797,7 +1797,7 @@ class ResizeActionBase(object): "Nova server status is not ACTIVE")) LOG.error(_("Error resizing instance %s.") % self.instance.id) - raise ex + raise LOG.debug("Recording success") self._record_action_success() diff --git a/trove/tests/api/users.py b/trove/tests/api/users.py index 6abe84c278..a141d6a5a7 100644 --- a/trove/tests/api/users.py +++ b/trove/tests/api/users.py @@ -69,7 +69,7 @@ class TestUsers(object): self.dbaas.databases.create(instance_info.id, databases) except exceptions.BadRequest as e: if "Validation error" in e.message: - raise e + raise if not FAKE: time.sleep(5)