summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cooker.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-09-01 21:37:20 +0100
commitfa87963b357c705597c61ffacb0f9c2ac12c1bd3 (patch)
tree1abee254eda11e38ec67fc2b44836ba27a8e00d7 /bitbake/lib/bb/cooker.py
parentd7cad22f482f8e5a8230572a23a0ca9800bfe7f3 (diff)
downloadpoky-fa87963b357c705597c61ffacb0f9c2ac12c1bd3.tar.gz
bitbake: 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) (Bitbake rev: ed30f4ee1cef8db9ea422c5e54b2375c4f3b1d6f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Conflicts: bitbake/lib/bb/tinfoil.py
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r--bitbake/lib/bb/cooker.py30
1 files changed, 30 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index f32dae0f58..d9bffc3ad2 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -38,6 +38,8 @@ import bb, bb.exceptions, bb.command
38from bb import utils, data, parse, event, cache, providers, taskdata, runqueue 38from bb import utils, data, parse, event, cache, providers, taskdata, runqueue
39import Queue 39import Queue
40import signal 40import signal
41import subprocess
42import errno
41import prserv.serv 43import prserv.serv
42import pyinotify 44import pyinotify
43 45
@@ -1525,6 +1527,34 @@ class BBCooker:
1525 def post_serve(self): 1527 def post_serve(self):
1526 prserv.serv.auto_shutdown(self.data) 1528 prserv.serv.auto_shutdown(self.data)
1527 bb.event.fire(CookerExit(), self.expanded_data) 1529 bb.event.fire(CookerExit(), self.expanded_data)
1530 lockfile = self.lock.name
1531 self.lock.close()
1532 self.lock = None
1533
1534 while not self.lock:
1535 with bb.utils.timeout(3):
1536 self.lock = bb.utils.lockfile(lockfile, shared=False, retry=False, block=True)
1537 if not self.lock:
1538 # Some systems may not have lsof available
1539 procs = None
1540 try:
1541 procs = subprocess.check_output(["lsof", '-w', lockfile], stderr=subprocess.STDOUT)
1542 except OSError as e:
1543 if e.errno != errno.ENOENT:
1544 raise
1545 if procs is None:
1546 # Fall back to fuser if lsof is unavailable
1547 try:
1548 procs = subprocess.check_output(["fuser", '-v', lockfile], stderr=subprocess.STDOUT)
1549 except OSError as e:
1550 if e.errno != errno.ENOENT:
1551 raise
1552
1553 msg = "Delaying shutdown due to active processes which appear to be holding bitbake.lock"
1554 if procs:
1555 msg += ":\n%s" % str(procs)
1556 print(msg)
1557
1528 1558
1529 def shutdown(self, force = False): 1559 def shutdown(self, force = False):
1530 if force: 1560 if force: