[ARVADOS] updated: c12be4d7070ee3de978c1426c68071fb53f1dabd

[Git user]

Summary of changes:
 services/nodemanager/arvnodeman/computenode/driver/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

       via  c12be4d7070ee3de978c1426c68071fb53f1dabd (commit)
      from  4d89b138dff0f1bcf1c867d529aff599fcc0cda2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c12be4d7070ee3de978c1426c68071fb53f1dabd
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Jun 14 09:57:54 2016 -0400

    9353: Don't retry all BaseHTTPError, only retry InvalidInstanceID.NotFound.

diff --git a/services/nodemanager/arvnodeman/computenode/driver/__init__.py b/services/nodemanager/arvnodeman/computenode/driver/__init__.py
index 63e4c00..db799bc 100644
--- a/services/nodemanager/arvnodeman/computenode/driver/__init__.py
+++ b/services/nodemanager/arvnodeman/computenode/driver/__init__.py
@@ -25,7 +25,7 @@ class BaseComputeNodeDriver(RetryMixin):
     Subclasses must implement arvados_create_kwargs, sync_node,
     node_fqdn, and node_start_time.
     """
-    CLOUD_ERRORS = NETWORK_ERRORS + (cloud_types.LibcloudError, BaseHTTPError)
+    CLOUD_ERRORS = NETWORK_ERRORS + (cloud_types.LibcloudError,)
 
     @RetryMixin._retry()
     def _create_driver(self, driver_class, **auth_kwargs):
@@ -211,6 +211,9 @@ class BaseComputeNodeDriver(RetryMixin):
         # libcloud compute drivers typically raise bare Exceptions to
         # represent API errors.  Return True for any exception that is
         # exactly an Exception, or a better-known higher-level exception.
+        if (exception is BaseHTTPError and
+            self.message and self.message.startswith("InvalidInstanceID.NotFound")):
+            return True
         return (isinstance(exception, cls.CLOUD_ERRORS) or
                 type(exception) is Exception)
 

-----------------------------------------------------------------------


hooks/post-receive
--