diff options
Diffstat (limited to 'designate/worker/tasks/zone.py')
| -rw-r--r-- | designate/worker/tasks/zone.py | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/designate/worker/tasks/zone.py b/designate/worker/tasks/zone.py index 19a86400..61e0d60f 100644 --- a/designate/worker/tasks/zone.py +++ b/designate/worker/tasks/zone.py @@ -88,17 +88,21 @@ class ZoneActionOnTarget(base.Task): self.action, self.zone.name, self.target) return True except Exception as e: - LOG.info('Failed to %(action)s zone %(zone)s on ' - 'target %(target)s on attempt %(attempt)d, ' - 'Error: %(error)s.', - { - 'action': self.action, - 'zone': self.zone.name, - 'target': self.target.id, - 'attempt': retry + 1, - 'error': str(e) - }) - time.sleep(self.retry_interval) + LOG.info( + 'Failed to %(action)s zone_name=%(zone_name)s ' + 'zone_id=%(zone_id)s on target=%(target)s on ' + 'attempt=%(attempt)d Error=%(error)s', + { + 'action': self.action, + 'zone_name': self.zone.name, + 'zone_id': self.zone.id, + 'target': self.target, + 'attempt': retry + 1, + 'error': str(e), + } + ) + + time.sleep(self.retry_interval) return False @@ -399,6 +403,10 @@ class ZonePoller(base.Task, ThresholdMixin): {'zone': self.zone.name, 'n': retry + 1}) time.sleep(retry_interval) + if not self.is_current_action_valid(self.context, self.zone.action, + self.zone): + break + return query_result def _on_failure(self, error_status): |