From bb62064aa6ce3528ff726c4fc469903b4371a17b Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Mon, 3 Oct 2011 03:11:19 +0200 Subject: [PATCH] Also blacklist with Node-related problems (besides App-related ones) --- src/nepi/testbeds/planetlab/node.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/nepi/testbeds/planetlab/node.py b/src/nepi/testbeds/planetlab/node.py index 6c11f44d..1d4d5cae 100644 --- a/src/nepi/testbeds/planetlab/node.py +++ b/src/nepi/testbeds/planetlab/node.py @@ -15,6 +15,7 @@ import sys import logging import ipaddr import operator +import re from nepi.util import server from nepi.util import parallel @@ -466,6 +467,8 @@ class Node(object): ) if proc.wait(): + if self.check_bad_host(out,err): + self.blacklist() raise RuntimeError, "Failed to set up application: %s %s" % (out,err,) # Launch p2p yum dependency installer @@ -753,3 +756,10 @@ class Node(object): elif out or err: logger.debug("%s said: %s%s", method, out, err) + def check_bad_host(self, out, err): + badre = re.compile(r'(?:' + r"curl: [(]\d+[)] Couldn't resolve host 'download1[.]rpmfusion[.]org'" + r'|Error: disk I/O error' + r')', + re.I) + return badre.search(out) or badre.search(err) -- 2.45.2