summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/server
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-14 17:49:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-15 11:48:33 +0000
commit32395abc6dc7b2f21a059b4a8677361caa95604b (patch)
treefbb3d8c4eeae71886d09c73fed8413bfa19143ef /bitbake/lib/bb/server
parentd1c2b732e7d516741f785586db5047dc704ae7c9 (diff)
downloadpoky-32395abc6dc7b2f21a059b4a8677361caa95604b.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: f02114cb70e8f6f1d32e19c02b758fe0aadecd19) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/server')
-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 1a6a826746..f7d07266cf 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -474,6 +474,8 @@ def connectProcessServer(sockname, featureset):
474 readfd = writefd = readfd1 = writefd1 = readfd2 = writefd2 = None 474 readfd = writefd = readfd1 = writefd1 = readfd2 = writefd2 = None
475 eq = command_chan_recv = command_chan = None 475 eq = command_chan_recv = command_chan = None
476 476
477 sock.settimeout(2)
478
477 try: 479 try:
478 try: 480 try:
479 os.chdir(os.path.dirname(sockname)) 481 os.chdir(os.path.dirname(sockname))