diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 30 |
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 | |||
38 | from bb import utils, data, parse, event, cache, providers, taskdata, runqueue | 38 | from bb import utils, data, parse, event, cache, providers, taskdata, runqueue |
39 | import Queue | 39 | import Queue |
40 | import signal | 40 | import signal |
41 | import subprocess | ||
42 | import errno | ||
41 | import prserv.serv | 43 | import prserv.serv |
42 | import pyinotify | 44 | import 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: |