Merge branch 'master' into 4570-multi-auth-method

[arvados.git] / services / nodemanager / arvnodeman / nodelist.py

diff --git a/services/nodemanager/arvnodeman/nodelist.py b/services/nodemanager/arvnodeman/nodelist.py
index 7ddfb7ca33e8b97f8132117c66789529415d8b90..83dd93f077bfb504a8f41b6f0addd93c717ac7da 100644 (file)
--- a/services/nodemanager/arvnodeman/nodelist.py
+++ b/services/nodemanager/arvnodeman/nodelist.py
@@ -11,10 +11,11 @@ class ArvadosNodeListMonitorActor(clientactor.RemotePollLoopActor):
     This actor regularly polls the list of Arvados node records, and
     sends it to subscribers.
     """
     This actor regularly polls the list of Arvados node records, and
     sends it to subscribers.
     """

-
-    CLIENT_ERRORS = config.ARVADOS_ERRORS

     LOGGER_NAME = 'arvnodeman.arvados_nodes'
 
     LOGGER_NAME = 'arvnodeman.arvados_nodes'
 

+    def is_common_error(self, exception):
+        return isinstance(exception, config.ARVADOS_ERRORS)
+

     def _item_key(self, node):
         return node['uuid']
 
     def _item_key(self, node):
         return node['uuid']
 


@@ -28,10 +29,11 @@ class CloudNodeListMonitorActor(clientactor.RemotePollLoopActor):
     This actor regularly polls the cloud to get a list of running compute
     nodes, and sends it to subscribers.
     """
     This actor regularly polls the cloud to get a list of running compute
     nodes, and sends it to subscribers.
     """

-
-    CLIENT_ERRORS = config.CLOUD_ERRORS

     LOGGER_NAME = 'arvnodeman.cloud_nodes'
 
     LOGGER_NAME = 'arvnodeman.cloud_nodes'
 

+    def is_common_error(self, exception):
+        return self._client.is_cloud_exception(exception)
+

     def _item_key(self, node):
         return node.id
 
     def _item_key(self, node):
         return node.id