11323: Don't try to offer_arvados_pair on unpaired nodes which are being shut down. 11325-no-broken-nodes
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 23 Mar 2017 17:30:35 +0000 (13:30 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 23 Mar 2017 18:09:06 +0000 (14:09 -0400)
services/nodemanager/arvnodeman/daemon.py

index d99917b5c3b4d79de31974e1d32ca0aa1ca5f514..e21bf3d16560676d6843c3de149dc120de2aab3e 100644 (file)
@@ -232,7 +232,7 @@ class NodeManagerDaemonActor(actor_class):
     def try_pairing(self):
         for record in self.cloud_nodes.unpaired():
             for arv_rec in self.arvados_nodes.unpaired():
-                if record.actor.offer_arvados_pair(arv_rec.arvados_node).get():
+                if record.actor is not None and record.actor.offer_arvados_pair(arv_rec.arvados_node).get():
                     self._pair_nodes(record, arv_rec.arvados_node)
                     break