From 4152c472430db1b32c943026f8c976bb99b9717b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 24 Aug 2017 00:21:53 +0100 Subject: bitbake: main: Attempt to gain bitbake.lock rather than just waiting Rather than just waiting for 5s, try and get the lockfile. If we gain the lock, we know we're ready to retry and can skip any remaining timeout. (Bitbake rev: 8a60106c6f7d586c793b965c5e9460b6016fab15) Signed-off-by: Richard Purdie --- bitbake/lib/bb/main.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py index 07972f69e5..6e6a346a06 100755 --- a/bitbake/lib/bb/main.py +++ b/bitbake/lib/bb/main.py @@ -446,7 +446,15 @@ def setup_bitbake(configParams, configuration, extrafeatures=None): logger.info("Reconnecting to bitbake server...") if not os.path.exists(sockname): print("Previous bitbake instance shutting down?, waiting to retry...") - time.sleep(5) + i = 0 + lock = None + # Wait for 5s or until we can get the lock + while not lock and i < 50: + time.sleep(0.1) + _, lock = lockBitbake() + i += 1 + if lock: + bb.utils.unlockfile(lock) raise bb.server.process.ProcessTimeout("Bitbake still shutting down as socket exists but no lock?") if not configParams.server_only: try: -- cgit v1.2.3-54-g00ecf