openstack/trove
Code Issues Proposed changes

Merge "Deleting failed replication backup can hide error"

Browse Source
This commit is contained in:
Jenkins 2014-11-21 03:08:24 +00:00 committed by Gerrit Code Review
commit b2aa4f993e
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
trove/taskmanager/models.py
View File

@ -350,7 +350,7 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin):
try: try:
db_info = DBBackup.create(**snapshot_info) db_info = DBBackup.create(**snapshot_info)
except InvalidModelError as e: except InvalidModelError:
msg = (_("Unable to create replication snapshot record for " msg = (_("Unable to create replication snapshot record for "
"instance: %s") % self.id) "instance: %s") % self.id)
LOG.exception(msg) LOG.exception(msg)
@ -366,17 +366,31 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin):
snapshot = master.get_replication_snapshot( snapshot = master.get_replication_snapshot(
snapshot_info, flavor=master.flavor_id) snapshot_info, flavor=master.flavor_id)
return snapshot return snapshot
except TroveError as e: except Exception as e_create:
msg = (_("Error creating replication snapshot " msg_create = (
"from instance %(source)s " _("Error creating replication snapshot from "
"for new replica %(replica)s.") % {'source': slave_of_id, "instance %(source)s for new replica %(replica)s.") %
'replica': self.id}) {'source': slave_of_id, 'replica': self.id})
err = inst_models.InstanceTasks.BUILDING_ERROR_REPLICA err = inst_models.InstanceTasks.BUILDING_ERROR_REPLICA
# if the delete of the 'bad' backup fails, it'll mask the
# create exception, so we trap it here
try:
Backup.delete(context, snapshot_info['id']) Backup.delete(context, snapshot_info['id'])
self._log_and_raise(e, msg, err) except Exception as e_delete:
except Exception: LOG.error(msg_create)
Backup.delete(context, snapshot_info['id']) # Make sure we log any unexpected errors from the create
raise if not isinstance(e_create, TroveError):
LOG.error(e_create)
msg_delete = (
_("An error occurred while deleting a bad "
"replication snapshot from instance %(source)s.") %
{'source': slave_of_id})
# we've already logged the create exception, so we'll raise
# the delete (otherwise the create will be logged twice)
self._log_and_raise(e_delete, msg_delete, err)
# the delete worked, so just log the original problem with create
self._log_and_raise(e_create, msg_create, err)
def report_root_enabled(self): def report_root_enabled(self):
mysql_models.RootHistory.create(self.context, self.id, 'root') mysql_models.RootHistory.create(self.context, self.id, 'root')