diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-06 11:36:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-06 10:28:04 +0000 |
commit | 005d59b13d141869a2c079544f2545c9e3624789 (patch) | |
tree | 337d8c1063e2001bcfd190696539405e5e31f9ff /bitbake/lib/bb | |
parent | 95ebfb33e4c0aa9669f318e061a4d7540b84f4ac (diff) | |
download | poky-005d59b13d141869a2c079544f2545c9e3624789.tar.gz |
bitbake: server/process: Fix unclosed socket warnings upon server connection refused
Extend the server error handling to avoid:
Reconnecting to bitbake server...
NOTE: Retrying server connection... (Traceback (most recent call last):
File "/home/pokybuild/yocto-worker/nightly-oe-selftest/build/bitbake/lib/bb/main.py", line 464, in setup_bitbake
server_connection = bb.server.process.connectProcessServer(sockname, featureset)
File "/home/pokybuild/yocto-worker/nightly-oe-selftest/build/bitbake/lib/bb/server/process.py", line 457, in connectProcessServer
sock.connect(os.path.basename(sockname))
ConnectionRefusedError: [Errno 111] Connection refused
)
WARNING: /home/pokybuild/yocto-worker/nightly-oe-selftest/build/bitbake/lib/bb/main.py:481: ResourceWarning: unclosed <socket.socket fd=20, family=AddressFamily.AF_UNIX, type=SocketKind.SOCK_STREAM, proto=0>
logger.info("Retrying server connection... (%s)" % traceback.format_exc())
NOTE: Starting bitbake server...
(Bitbake rev: 115919f0c11e22df783348422e06ab95f5c943e1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/server/process.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index 828159ed75..2246d954ce 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py | |||
@@ -452,15 +452,14 @@ def connectProcessServer(sockname, featureset): | |||
452 | cwd = os.getcwd() | 452 | cwd = os.getcwd() |
453 | 453 | ||
454 | try: | 454 | try: |
455 | os.chdir(os.path.dirname(sockname)) | 455 | try: |
456 | sock.connect(os.path.basename(sockname)) | 456 | os.chdir(os.path.dirname(sockname)) |
457 | finally: | 457 | sock.connect(os.path.basename(sockname)) |
458 | os.chdir(cwd) | 458 | finally: |
459 | 459 | os.chdir(cwd) | |
460 | readfd = writefd = readfd1 = writefd1 = readfd2 = writefd2 = None | ||
461 | eq = command_chan_recv = command_chan = None | ||
462 | 460 | ||
463 | try: | 461 | readfd = writefd = readfd1 = writefd1 = readfd2 = writefd2 = None |
462 | eq = command_chan_recv = command_chan = None | ||
464 | 463 | ||
465 | # Send an fd for the remote to write events to | 464 | # Send an fd for the remote to write events to |
466 | readfd, writefd = os.pipe() | 465 | readfd, writefd = os.pipe() |