From 798b08af218972bf9fb60101b7f85fd71951c6b7 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 1 Apr 2016 13:28:03 -0400 Subject: [PATCH] 8816: Handle cloud errors slightly differently from unrecognized errors. --- .../nodemanager/arvnodeman/computenode/dispatch/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py index 42960efeba..26744c42db 100644 --- a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py +++ b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py @@ -279,10 +279,14 @@ class ComputeNodeUpdateActor(config.actor_class): self.next_request_time = time.time() try: result = orig_func(self, *args, **kwargs) - except Exception as error: + except self._cloud.CLOUD_ERRORS as error: self.error_streak += 1 self.next_request_time += min(2 ** self.error_streak, self.max_retry_wait) + self._logger.error( + "Caught cloud error (no retry): %s", + error, exc_info=error) + except Exception as error: self._logger.error( "Caught unknown error (no retry): %s", error, exc_info=error) -- 2.30.2