From 4c1418f7b415beac59a2d9d170a5ed420f81be06 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 24 Nov 2015 11:15:39 -0500 Subject: [PATCH] Retry API calls if they get a Retryable failure keystoneauth1 Session throws exceptions based on RetriableConnectionFailure when the operation can be sanely retried. Since we have commuication encapsulated, there is no reason to not just retry. We should maybe in the future allow for configuration of number of times to retry - but let's start with one and go from there. Change-Id: Iacc6ac3d7eecbccfa7602fefb238602cc8a66cc4 --- shade/task_manager.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/shade/task_manager.py b/shade/task_manager.py index c96e86617..8de4b3add 100644 --- a/shade/task_manager.py +++ b/shade/task_manager.py @@ -22,6 +22,7 @@ import threading import time import types +import keystoneauth1.exceptions import six from shade import _log @@ -90,7 +91,16 @@ class Task(object): def run(self, client): try: - self.done(self.main(client)) + # Retry one time if we get a retriable connection failure + try: + self.done(self.main(client)) + except keystoneauth1.exceptions.RetriableConnectionFailure: + client.log.debug( + "Connection failure for {name}, retrying".format( + name=type(self).__name__)) + self.done(self.main(client)) + except Exception: + raise except Exception as e: self.exception(e, sys.exc_info()[2])