mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: main: Alter EOFError handling

Browse Source 
If the server shuts down 'cleanly' due to some issue, the socket will close.
A recently reported example was an invalid PRSERV being set. Doing this silently
and without changing the retries count will case the server startup to loop
infinitely.

Change the code so it triggers the usual retries note messages and times
out eventually pointing the user at the cooker log file.

[YOCTO #12984]

(Bitbake rev: bb696636ef0c59f9e9640bb9460e7cce323cc785)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2019-07-02 11:56:31 +01:00
parent 53138165bc
commit 97e19bf73b
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/main.py
+2 -7
View File
@@ -447,12 +447,7 @@ def setup_bitbake(configParams, configuration, extrafeatures=None):
bb.utils.unlockfile(lock) bb.utils.unlockfile(lock)
raise bb.server.process.ProcessTimeout("Bitbake still shutting down as socket exists but no lock?") raise bb.server.process.ProcessTimeout("Bitbake still shutting down as socket exists but no lock?")
if not configParams.server_only: if not configParams.server_only:
try: server_connection = bb.server.process.connectProcessServer(sockname, featureset)
server_connection = bb.server.process.connectProcessServer(sockname, featureset)
except EOFError:
# The server may have been shutting down but not closed the socket yet. If that happened,
# ignore it.
pass
if server_connection or configParams.server_only: if server_connection or configParams.server_only:
break break
@@ -463,7 +458,7 @@ def setup_bitbake(configParams, configuration, extrafeatures=None):
raise raise
retries -= 1 retries -= 1
tryno = 8 - retries tryno = 8 - retries
if isinstance(e, (bb.server.process.ProcessTimeout, BrokenPipeError)): if isinstance(e, (bb.server.process.ProcessTimeout, BrokenPipeError, EOFError)):
logger.info("Retrying server connection (#%d)..." % tryno) logger.info("Retrying server connection (#%d)..." % tryno)
else: else:
logger.info("Retrying server connection (#%d)... (%s)" % (tryno, traceback.format_exc())) logger.info("Retrying server connection (#%d)... (%s)" % (tryno, traceback.format_exc()))