diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-08 17:29:49 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-08 17:35:10 +0000 |
| commit | 22685460b5ecb1aeb4ff3436088ecdacb43044d7 (patch) | |
| tree | b4b019bb14605df549b4ac673634f8f232a37836 /lib/bb/main.py | |
| parent | a1a86f8c311cb1fc4f5562f1c77f82aa95141eee (diff) | |
| download | bitbake-22685460b5ecb1aeb4ff3436088ecdacb43044d7.tar.gz | |
main/server: Add lockfile debugging upon server retry
We keep seeing server issues where the lockfile is present but we can't
connect to it. Reuse the lockfile debugging code from the server to
dump better information to the console from the client side when we
run into this issue. Whilst not pretty, this might give us a chance
of being able to debug the problems further.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/main.py')
| -rwxr-xr-x | lib/bb/main.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/bb/main.py b/lib/bb/main.py index 6294b85cf..1e38d04bc 100755 --- a/lib/bb/main.py +++ b/lib/bb/main.py @@ -422,7 +422,7 @@ def setup_bitbake(configParams, extrafeatures=None): retries = 8 while retries: try: - topdir, lock = lockBitbake() + topdir, lock, lockfile = lockBitbake() sockname = topdir + "/bitbake.sock" if lock: if configParams.status_only or configParams.kill_server: @@ -439,12 +439,15 @@ def setup_bitbake(configParams, extrafeatures=None): logger.info("Reconnecting to bitbake server...") if not os.path.exists(sockname): logger.info("Previous bitbake instance shutting down?, waiting to retry... (%s)" % timestamp()) + procs = bb.server.process.get_lockfile_process_msg(lockfile) + if procs: + logger.info("Processes holding bitbake.lock:\n%s" % procs) 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() + _, lock, _ = lockBitbake() i += 1 if lock: bb.utils.unlockfile(lock) @@ -494,5 +497,5 @@ def lockBitbake(): bb.error("Unable to find conf/bblayers.conf or conf/bitbake.conf. BBPATH is unset and/or not in a build directory?") raise BBMainFatal lockfile = topdir + "/bitbake.lock" - return topdir, bb.utils.lockfile(lockfile, False, False) + return topdir, bb.utils.lockfile(lockfile, False, False), lockfile |