From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Thu, 23 Mar 2017 17:30:35 +0000 (-0400)
Subject: 11323: Don't try to offer_arvados_pair on unpaired nodes which are being shut down.
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/912c6ffed63537757268fcc5f762e20bc5b8b860

11323: Don't try to offer_arvados_pair on unpaired nodes which are being shut down.
---

diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py
index d99917b5c3..e21bf3d165 100644
--- a/services/nodemanager/arvnodeman/daemon.py
+++ b/services/nodemanager/arvnodeman/daemon.py
@@ -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