diff options
-rw-r--r-- | lib/bb/cooker.py | 30 | ||||
-rwxr-xr-x | lib/bb/main.py | 1 | ||||
-rw-r--r-- | lib/bb/tinfoil.py | 5 | ||||
-rw-r--r-- | lib/bb/utils.py | 29 |
4 files changed, 61 insertions, 4 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index f32dae0f5..d9bffc3ad 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -38,6 +38,8 @@ import bb, bb.exceptions, bb.command from bb import utils, data, parse, event, cache, providers, taskdata, runqueue import Queue import signal +import subprocess +import errno import prserv.serv import pyinotify @@ -1525,6 +1527,34 @@ class BBCooker: def post_serve(self): prserv.serv.auto_shutdown(self.data) bb.event.fire(CookerExit(), self.expanded_data) + lockfile = self.lock.name + self.lock.close() + self.lock = None + + while not self.lock: + with bb.utils.timeout(3): + self.lock = bb.utils.lockfile(lockfile, shared=False, retry=False, block=True) + if not self.lock: + # Some systems may not have lsof available + procs = None + try: + procs = subprocess.check_output(["lsof", '-w', lockfile], stderr=subprocess.STDOUT) + except OSError as e: + if e.errno != errno.ENOENT: + raise + if procs is None: + # Fall back to fuser if lsof is unavailable + try: + procs = subprocess.check_output(["fuser", '-v', lockfile], stderr=subprocess.STDOUT) + except OSError as e: + if e.errno != errno.ENOENT: + raise + + msg = "Delaying shutdown due to active processes which appear to be holding bitbake.lock" + if procs: + msg += ":\n%s" % str(procs) + print(msg) + def shutdown(self, force = False): if force: diff --git a/lib/bb/main.py b/lib/bb/main.py index 1f19cc5dc..fea754f53 100755 --- a/lib/bb/main.py +++ b/lib/bb/main.py @@ -258,6 +258,7 @@ def start_server(servermodule, configParams, configuration, features): logger.handle(event) raise exc_info[1], None, exc_info[2] server.detach() + cooker.lock.close() return server diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index 8fc9be303..1ea46d8ee 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -84,6 +84,11 @@ class Tinfoil: else: self.parseRecipes() + def shutdown(self): + self.cooker.shutdown(force=True) + self.cooker.post_serve() + self.cooker.unlockBitbake() + class TinfoilConfigParameters(ConfigParameters): def __init__(self, **options): diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 0db7e5665..d380a3708 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -31,6 +31,7 @@ import subprocess import glob import traceback import errno +import signal from commands import getstatusoutput from contextlib import contextmanager @@ -412,10 +413,30 @@ def fileslocked(files): for lock in locks: bb.utils.unlockfile(lock) -def lockfile(name, shared=False, retry=True): +@contextmanager +def timeout(seconds): + def timeout_handler(signum, frame): + pass + + original_handler = signal.signal(signal.SIGALRM, timeout_handler) + + try: + signal.alarm(seconds) + yield + finally: + signal.alarm(0) + signal.signal(signal.SIGALRM, original_handler) + +def lockfile(name, shared=False, retry=True, block=False): """ - Use the file fn as a lock file, return when the lock has been acquired. - Returns a variable to pass to unlockfile(). + Use the specified file as a lock file, return when the lock has + been acquired. Returns a variable to pass to unlockfile(). + Parameters: + retry: True to re-try locking if it fails, False otherwise + block: True to block until the lock succeeds, False otherwise + The retry and block parameters are kind of equivalent unless you + consider the possibility of sending a signal to the process to break + out - at which point you want block=True rather than retry=True. """ dirname = os.path.dirname(name) mkdirhier(dirname) @@ -428,7 +449,7 @@ def lockfile(name, shared=False, retry=True): op = fcntl.LOCK_EX if shared: op = fcntl.LOCK_SH - if not retry: + if not retry and not block: op = op | fcntl.LOCK_NB while True: |