[ARVADOS] updated: 0de159f9e971e89fa13acb75d0c0df193b1319c6

git at public.curoverse.com git at public.curoverse.com
Wed Sep 9 16:34:03 EDT 2015


Summary of changes:
 services/nodemanager/arvnodeman/computenode/driver/azure.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

       via  0de159f9e971e89fa13acb75d0c0df193b1319c6 (commit)
      from  d8df6da4433fdd4ba80cb893e976e72f41f62b32 (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 0de159f9e971e89fa13acb75d0c0df193b1319c6
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Sep 9 16:35:36 2015 -0400

    Catch errors thrown by sync_node() in Azure driver refs #7031.

diff --git a/services/nodemanager/arvnodeman/computenode/driver/azure.py b/services/nodemanager/arvnodeman/computenode/driver/azure.py
index 4ef4e10..430eac1 100644
--- a/services/nodemanager/arvnodeman/computenode/driver/azure.py
+++ b/services/nodemanager/arvnodeman/computenode/driver/azure.py
@@ -7,6 +7,7 @@ import time
 import libcloud.compute.base as cloud_base
 import libcloud.compute.providers as cloud_provider
 import libcloud.compute.types as cloud_types
+from libcloud.common.exceptions import BaseHTTPError
 
 from . import BaseComputeNodeDriver
 from .. import arvados_node_fqdn, arvados_timestamp, ARVADOS_TIMEFMT
@@ -49,8 +50,12 @@ class ComputeNodeDriver(BaseComputeNodeDriver):
         }
 
     def sync_node(self, cloud_node, arvados_node):
-        self.real.ex_create_tags(cloud_node,
-                                 {'hostname': arvados_node_fqdn(arvados_node)})
+        try:
+            self.real.ex_create_tags(cloud_node,
+                                     {'hostname': arvados_node_fqdn(arvados_node)})
+            return True
+        except BaseHTTPError as b
+            return False
 
     def _init_image(self, urn):
         return "image", self.get_image(urn)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list