summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-28 12:58:57 -1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-29 00:21:40 +0100
commit1bab588f4e0891032d57790661133ee153fa5f01 (patch)
treefa2054a0ff1d367d210c9734394177849926c1f4
parent11009210ccc15a3052846df04a43706e83ae54fd (diff)
downloadpoky-1bab588f4e0891032d57790661133ee153fa5f01.tar.gz
bitbake: server/process: Account for xmlrpc connections
UI control can happen via the xmlrpc connection. Account for this when timing out UI connections. This was causing issues for toaster on systems where it couldn't parse the metadata within the timeout. (Bitbake rev: 838a89141fd6a75da9f982ad2b035e823b692d2a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit fa85a8263971c25e67fa3b421c686a90e46acd87) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/server/process.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index 5a87f0820d..b66fbe0acd 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -202,7 +202,7 @@ class ProcessServer(multiprocessing.Process):
202 # If we don't see a UI connection within maxuiwait, its unlikely we're going to see 202 # If we don't see a UI connection within maxuiwait, its unlikely we're going to see
203 # one. We have had issue with processes hanging indefinitely so timing out UI-less 203 # one. We have had issue with processes hanging indefinitely so timing out UI-less
204 # servers is useful. 204 # servers is useful.
205 if not self.hadanyui and not self.timeout and (self.lastui + self.maxuiwait) < time.time(): 205 if not self.hadanyui and not self.xmlrpc and not self.timeout and (self.lastui + self.maxuiwait) < time.time():
206 print("No UI connection within max timeout, exiting to avoid infinite loop.") 206 print("No UI connection within max timeout, exiting to avoid infinite loop.")
207 self.quit = True 207 self.quit = True
208 208