[ARVADOS] updated: 22fb8112e4a66280669cc84a44550172b5a438e7

[Git user]

Summary of changes:
 services/nodemanager/arvnodeman/baseactor.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

       via  22fb8112e4a66280669cc84a44550172b5a438e7 (commit)
       via  1eb5f8fe7b290813e2c40a8d248280d488fc37fb (commit)
      from  d3bd05e221e5b7bf516bb1043bee96ab363c0af8 (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 22fb8112e4a66280669cc84a44550172b5a438e7
Merge: d3bd05e 1eb5f8f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 25 16:30:10 2016 -0400

    Merge branch '9303-kill-nodemanager-on-dead-actor' refs #9303


commit 1eb5f8fe7b290813e2c40a8d248280d488fc37fb
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 25 16:29:30 2016 -0400

    9303: Watchdog kill node manager on any error

diff --git a/services/nodemanager/arvnodeman/baseactor.py b/services/nodemanager/arvnodeman/baseactor.py
index 0cf7c96..6169587 100644
--- a/services/nodemanager/arvnodeman/baseactor.py
+++ b/services/nodemanager/arvnodeman/baseactor.py
@@ -107,14 +107,11 @@ class WatchdogActor(pykka.ThreadingActor):
         self._later.run()
 
     def run(self):
-        for a in self.actors:
-            try:
+        a = None
+        try:
+            for a in self.actors:
                 a.ping().get(self.timeout)
-            except pykka.ActorDeadError:
-                pass
-            except pykka.Timeout:
-                self.kill_self(a)
-                return
-
-        time.sleep(20)
-        self._later.run()
+            time.sleep(20)
+            self._later.run()
+        except:
+            self.kill_self(a)

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


hooks/post-receive
--