summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/command.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-31 10:16:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 07:34:09 +0100
commit4c2f28bf482c2abda937b21217fc41d71f037166 (patch)
tree88d2a9793a671d2b0b575ab6c65a8ca0751b5d10 /bitbake/lib/bb/command.py
parent18dfdb08403856c106169a969ce9080c60b7cb51 (diff)
downloadpoky-4c2f28bf482c2abda937b21217fc41d71f037166.tar.gz
bitbake: cooker: properly fix bitbake.lock handling
If the PR server or indeed any other child process takes some time to exit (which it sometimes does when saving its database), it can end up holding bitbake.lock after the UI exits, which led to errors if you ran bitbake commands successively - we saw this when running the PR server oe-selftest tests in OE-Core. The recent attempt to fix this wasn't quite right and ended up breaking memory resident bitbake. This time we close the lock file when cooker shuts down (inside the UI process) instead of unlocking it, and this is done in the cooker code rather than the actual UI code so it doesn't matter which UI is in use. Additionally we report that we're waiting for the lock to be released, using lsof or fuser if available to list the processes with the lock open. The 'magic' in the locking is due to all spawned subprocesses of bitbake holding an open file descriptor to the bitbake.lock. It is automatically unlocked when all those fds close the file (as all the processes terminate). We close the UI copy of the lock explicitly, then close the server process copy, any remaining open copy is therefore some proess exiting. (The reproducer for the problem is to set PRSERV_HOST = "localhost:0" and add a call to time.sleep(20) after self.server_close() in lib/prserv/serv.py, then run "bitbake -p; bitbake -p" ). Cleanup work done by Paul Eggleton <paul.eggleton@linux.intel.com>. This reverts bitbake commit 69ecd15aece54753154950c55d7af42f85ad8606 and e97a9f1528d77503b5c93e48e3de9933fbb9f3cd. (Bitbake rev: a29780bd43f74b7326fe788dbd65177b86806fcf) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/command.py')
-rw-r--r--bitbake/lib/bb/command.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index 2b02584b5e..24ff341045 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -267,12 +267,6 @@ class CommandsSync:
267 features = params[0] 267 features = params[0]
268 command.cooker.setFeatures(features) 268 command.cooker.setFeatures(features)
269 269
270 def unlockBitbake(self, command, params):
271 """
272 Unlock bitbake.lock file
273 """
274 command.cooker.unlockBitbake()
275
276 # although we change the internal state of the cooker, this is transparent since 270 # although we change the internal state of the cooker, this is transparent since
277 # we always take and leave the cooker in state.initial 271 # we always take and leave the cooker in state.initial
278 setFeatures.readonly = True 272 setFeatures.readonly = True