Merge branch 'master' into 9369-arv-cwl-docs

[arvados.git] / services / nodemanager / arvnodeman / baseactor.py

diff --git a/services/nodemanager/arvnodeman/baseactor.py b/services/nodemanager/arvnodeman/baseactor.py
index b48e007676817cc125d19fb369a93429697210fd..68ea97ab75aac1b71aca36427165ed54cef97cc2 100644 (file)
--- a/services/nodemanager/arvnodeman/baseactor.py
+++ b/services/nodemanager/arvnodeman/baseactor.py
@@ -84,7 +84,7 @@ class BaseNodeManagerActor(pykka.ThreadingActor):
         if (exception_type in (threading.ThreadError, MemoryError) or
             exception_type is OSError and exception_value.errno == errno.ENOMEM):
             lg.critical("Unhandled exception is a fatal error, killing Node Manager")
-            os.killpg(os.getpgid(0), signal.SIGKILL)
+            os.kill(os.getpid(), signal.SIGKILL)
 
     def ping(self):
         return True
@@ -98,23 +98,21 @@ class WatchdogActor(pykka.ThreadingActor):
          self.actor_ref = TellableActorRef(self)
          self._later = self.actor_ref.tell_proxy()
 
-    def kill_self(self, act):
+    def kill_self(self, e, act):
         lg = getattr(self, "_logger", logging)
+        lg.critical("Watchdog exception", exc_info=e)
         lg.critical("Actor %s watchdog ping time out, killing Node Manager", act)
-        os.killpg(os.getpgid(0), signal.SIGKILL)
+        os.kill(os.getpid(), signal.SIGKILL)
 
     def on_start(self):
         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 Exception as e:
+            self.kill_self(e, a)