[ARVADOS] updated: bf49d05bceebdc47979bde37a0ad82ddfcbaf3f5

[Git user]

Summary of changes:
 services/nodemanager/arvnodeman/computenode/dispatch/__init__.py | 4 +++-
 services/nodemanager/arvnodeman/daemon.py                        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

       via  bf49d05bceebdc47979bde37a0ad82ddfcbaf3f5 (commit)
      from  223fd5187a0ecaa9f9c65be2a6733b4f3b56c99e (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 bf49d05bceebdc47979bde37a0ad82ddfcbaf3f5
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Mar 3 16:59:35 2016 -0500

    8543: Tests pass

diff --git a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py
index ef37844..e11dcc7 100644
--- a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py
+++ b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py
@@ -37,8 +37,10 @@ class ComputeNodeStateChangeBase(config.actor_class, RetryMixin):
         self._set_logger()
 
     def _finished(self):
+        if self.subscribers is None:
+            raise Exception("Actor tried to finish twice")
         _notify_subscribers(self._later, self.subscribers)
-        self.subscribers.clear()
+        self.subscribers = None
         self._logger.info("finished")
 
     def subscribe(self, subscriber):
diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py
index 23804f7..33b6cd5 100644
--- a/services/nodemanager/arvnodeman/daemon.py
+++ b/services/nodemanager/arvnodeman/daemon.py
@@ -202,7 +202,6 @@ class NodeManagerDaemonActor(actor_class):
                 except pykka.ActorDeadError:
                     pass
                 del self.shutdowns[key]
-            if key in self.sizes_booting_shutdown:
                 del self.sizes_booting_shutdown[key]
             record.actor.stop()
             record.cloud_node = None
@@ -443,6 +442,7 @@ class NodeManagerDaemonActor(actor_class):
         elif cloud_node_id in self.booted:
             self.booted.pop(cloud_node_id).actor.stop()
         del self.shutdowns[cloud_node_id]
+        del self.sizes_booting_shutdown[cloud_node_id]
 
     def shutdown(self):
         self._logger.info("Shutting down after signal.")

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


hooks/post-receive
--