From: Ondrej Lichtner <olichtne(a)redhat.com&gt; This commit adds handling of exceptions raised during execution of slave methods. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- lnst/Slave/NetTestSlave.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py index 677fe6b..c35e6af 100644 --- a/lnst/Slave/NetTestSlave.py +++ b/lnst/Slave/NetTestSlave.py @@ -14,6 +14,7 @@ jpirko(a)redhat.com (Jiri Pirko) import signal import select, logging import os +import sys, traceback import datetime import socket from time import sleep @@ -362,7 +363,19 @@ class NetTestSlave: if msg["type"] == "command": method = getattr(self._methods, msg["method_name"], None) if method != None: - result = method(*msg["args"]) + try: + result = method(*msg["args"]) + except: + log_exc_traceback() + type, value, tb = sys.exc_info() + exc_trace = ''.join(traceback.format_exception(type, + value, tb)) + response = {"type": "exception", + "Exception": exc_trace} + if not self._server_handler.send_data_to_ctl(response): + self._cmd_context.cleanup() + self._log_ctl.cancel_connection() + return if result != None: response = {"type": "result", "result": result} -- 1.7.11.7

From: Ondrej Lichtner <olichtne(a)redhat.com&gt; This commit adds a new slave method kill_cmds that will perform a cleanup on the command context. This should be used by the controller during slave cleanup phase, so that there are no leftover commands running. I also added a few calls of command context cleanup to the slave server so that if a connection from controller is lost we also cleanup all running commands. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- lnst/Slave/NetTestSlave.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py index c35e6af..be85da4 100644 --- a/lnst/Slave/NetTestSlave.py +++ b/lnst/Slave/NetTestSlave.py @@ -80,6 +80,11 @@ class SlaveMethods: self._remove_capture_files() return "bye" + def kill_cmds(self): + logging.info("Killing all forked processes.") + self._command_context.cleanup() + return "Commands killed" + def get_devices_by_hwaddr(self, hwaddr): name_scan = scan_netdevs() netdevs = [] @@ -346,6 +351,7 @@ class NetTestSlave: self._server_handler.accept_connection() except socket.error: continue + self._cmd_context.cleanup() self._log_ctl.set_connection( self._server_handler.get_ctl_sock()) @@ -355,6 +361,7 @@ class NetTestSlave: self._process_msg(msg[1]) if self._server_handler.get_ctl_sock() == None: + self._cmd_context.cleanup() self._log_ctl.cancel_connection() self._cmd_context.cleanup() @@ -380,14 +387,17 @@ class NetTestSlave: if result != None: response = {"type": "result", "result": result} if not self._server_handler.send_data_to_ctl(response): + self._cmd_context.cleanup() self._log_ctl.cancel_connection() else: err = "Method not found: %s" % msg["method_name"] response = {"type": "error", "err": err} if not self._server_handler.send_data_to_ctl(response): + self._cmd_context.cleanup() self._log_ctl.cancel_connection() elif msg["type"] == "log": if not self._server_handler.send_data_to_ctl(msg): + self._cmd_context.cleanup() self._log_ctl.cancel_connection() elif msg["type"] == "exception": if msg["cmd_id"] != None: @@ -400,11 +410,13 @@ class NetTestSlave: cmd.join() self._cmd_context.del_cmd(cmd) if not self._server_handler.send_data_to_ctl(msg): + self._cmd_context.cleanup() self._log_ctl.cancel_connection() elif msg["type"] == "result": if msg["cmd_id"] == None: del msg["cmd_id"] if not self._server_handler.send_data_to_ctl(msg): + self._cmd_context.cleanup() self._log_ctl.cancel_connection() cmd = self._cmd_context.get_cmd(None) cmd.join() @@ -416,6 +428,7 @@ class NetTestSlave: if cmd.finished(): if not self._server_handler.send_data_to_ctl(msg): + self._cmd_context.cleanup() self._log_ctl.cancel_connection() self._cmd_context.del_cmd(cmd) else: -- 1.7.11.7