[PATCH 1/5] NetTestCommand: fix deadlock bug
by Ondrej Lichtner
From: Ondrej Lichtner <olichtne(a)redhat.com>
This commit fixes a deadlock situation that appears in case we interrupt
a command which results in the command ending a large amount of data at
once through the communication pipe. The pipe is buffered so the write
operation starts blocking until somebody starts reading from the pipe.
However the main process that would be reading this message is waiting
in a join() call creating a deadlock.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
lnst/Common/NetTestCommand.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/lnst/Common/NetTestCommand.py b/lnst/Common/NetTestCommand.py
index 2ce9b67..b5569a5 100644
--- a/lnst/Common/NetTestCommand.py
+++ b/lnst/Common/NetTestCommand.py
@@ -144,7 +144,6 @@ class NetTestCommand:
if os.path.exists("/proc/%d" % self._pid):
logging.debug("Interrupting background command with id \"%s\", pid \"%d\"" % (self._id, self._pid))
os.killpg(os.getpgid(self._pid), signal.SIGINT)
- self._process.join()
def kill(self):
if os.path.exists("/proc/%d" % self._pid):
--
1.7.11.7
11 years
[PATCH 0/4] various fixes
by Ondrej Lichtner
From: Ondrej Lichtner <olichtne(a)redhat.com>
This patch set brings a few fixes to the smoke tests that were recently
implemented but were not fully tested because lnst wasn't fully working at the
time.
Additionally the smoke tests revealed a bug with team configuration that I fixed
in this patchset.
Finally I added some functionality to the SlavePool class so that it only uses
machines that are online. I added this because I added two more machines to my
pool and had to modify my recipes to specifically match the second pair of
machines.
If there are any issues contact me.
Ondrej Lichtner (4):
NetConfigDevice: fix team configuration
conf-vlan.xml: fix id and xml error
conf-team.xml: fix slave ids, remove hwaddr
SlavePool: test connection to slave machines
lnst/Controller/NetTestController.py | 2 +-
lnst/Controller/SlavePool.py | 16 +++++++++++++++-
lnst/Slave/NetConfigDevice.py | 8 +++++---
recipes/smoke/lib/conf-team.xml | 5 ++---
recipes/smoke/lib/conf-vlan.xml | 4 ++--
5 files changed, 25 insertions(+), 10 deletions(-)
--
1.7.11.7
11 years