summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-14 17:49:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 22:27:46 +0000
commitd3b7f2ead56b8d9f3df6bddc0f6b9749dcd562cf (patch)
tree95b66c76347158d2518793d89c96dd12e3bc6d52 /bitbake
parent3690c081c1b983a70b4a1541c48d690249e993b2 (diff)
downloadpoky-d3b7f2ead56b8d9f3df6bddc0f6b9749dcd562cf.tar.gz
bitbake: server/process: Ensure socket has a timeout set
We're seeing hangs in oe-selftest where server startup and shutdown are racing. The assumption was a connect would timeout however no timeout is set which can leave processes hanging. Set a short timeout for the connection to avoid this. (Bitbake rev: e53c1009356cc49c57d3b9af1e3dda6927acd78d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/server/process.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index a76b0a50c7..0854d48091 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -473,6 +473,8 @@ def connectProcessServer(sockname, featureset):
473 readfd = writefd = readfd1 = writefd1 = readfd2 = writefd2 = None 473 readfd = writefd = readfd1 = writefd1 = readfd2 = writefd2 = None
474 eq = command_chan_recv = command_chan = None 474 eq = command_chan_recv = command_chan = None
475 475
476 sock.settimeout(2)
477
476 try: 478 try:
477 try: 479 try:
478 os.chdir(os.path.dirname(sockname)) 480 os.chdir(os.path.dirname(sockname))