From 2c69d491fbbd1461bb5a6dd9c0f0dd493081b45e Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 16 Mar 2017 16:11:00 -0400 Subject: [PATCH] 11254: Cloud nodes where "actor is None" are considered to be in shutdown. The only time it should be "None" is the period between a successful shutdown and when the node disappears from the cloud node list. --- services/nodemanager/arvnodeman/daemon.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py index dcbc87ccc8..cb11521ef9 100644 --- a/services/nodemanager/arvnodeman/daemon.py +++ b/services/nodemanager/arvnodeman/daemon.py @@ -246,10 +246,12 @@ class NodeManagerDaemonActor(actor_class): states = pykka.get_all(rec.actor.get_state() for rec in self.cloud_nodes.nodes.itervalues() if ((size is None or rec.cloud_node.size.id == size.id) and - rec.shutdown_actor is None)) + rec.shutdown_actor is None and + rec.actor is not None)) states += ['shutdown' for rec in self.cloud_nodes.nodes.itervalues() if ((size is None or rec.cloud_node.size.id == size.id) and - rec.shutdown_actor is not None)] + (rec.shutdown_actor is not None or + rec.actor is None))] return states def _state_counts(self, size): -- 2.30.2