[bitbake-devel,dunfell,1.46,2/2] server/process: Account for xmlrpc connections

Submitted by Steve Sakoman on July 28, 2020, 10:58 p.m. | Patch ID: 174848

Details

Message ID f2b23d64f582adbc3417bd325b477a38152d1897.1595977046.git.steve@sakoman.com
State New
Headers show

Commit Message

Steve Sakoman July 28, 2020, 10:58 p.m.
From: Richard Purdie <richard.purdie@linuxfoundation.org>

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit fa85a8263971c25e67fa3b421c686a90e46acd87)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 lib/bb/server/process.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py
index 5a87f082..b66fbe0a 100644
--- a/lib/bb/server/process.py
+++ b/lib/bb/server/process.py
@@ -202,7 +202,7 @@  class ProcessServer(multiprocessing.Process):
             # If we don't see a UI connection within maxuiwait, its unlikely we're going to see
             # one. We have had issue with processes hanging indefinitely so timing out UI-less
             # servers is useful.
-            if not self.hadanyui and not self.timeout and (self.lastui + self.maxuiwait) < time.time():
+            if not self.hadanyui and not self.xmlrpc and not self.timeout and (self.lastui + self.maxuiwait) < time.time():
                 print("No UI connection within max timeout, exiting to avoid infinite loop.")
                 self.quit = True