From dee77eca39f406f90e60d9c5ef7a66fcc8f57dbf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 21 Nov 2012 09:15:34 +0000 Subject: bitbake: server/process.py: Change timeout error handling In normal usage, we never hit the timeout issue. If we do, it becomes obvious that the current error handling is not good enough. The request may have made it to the server and the answer will get queued. This means the next command may get the return value from the previous command with suitably puzzling results. Without rewriting large sections of code, its not possible to avoid this problem. It is better to increase the timeout to several seconds giving the server a chance to respond and if it does timeout, hard exit since recovery is not possible with the code base today. I'd be happy to see the structure of this code improved but this quick fix at least stops corrupted builds from happening which has to be a good thing. (Bitbake rev: 410c11dd10736873f2dc587fbe9119c38831e693) Signed-off-by: Richard Purdie --- bitbake/lib/bb/server/process.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index f1e8450b12..8ebf771878 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py @@ -45,10 +45,10 @@ class ServerCommunicator(): while True: # don't let the user ctrl-c while we're waiting for a response try: - if self.connection.poll(.5): + if self.connection.poll(20): return self.connection.recv() else: - return None, "Timeout while attempting to communicate with bitbake server" + bb.fatal("Timeout while attempting to communicate with bitbake server") except KeyboardInterrupt: pass -- cgit v1.2.3-54-g00ecf