summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2020-12-02 13:58:10 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-09 12:27:25 +0000
commit221dc50cde88977907a58aa23a6efd8c289113da (patch)
treefb6757968729dc0aece7fcb7ccda266791123a96
parentbf1521fbf1572c823d98ce2cf00f26fb6447262f (diff)
downloadpoky-221dc50cde88977907a58aa23a6efd8c289113da.tar.gz
poky-221dc50cde88977907a58aa23a6efd8c289113da.tar.bz2
poky-221dc50cde88977907a58aa23a6efd8c289113da.zip
bitbake: hashserv: client: Fix AF_UNIX path length limits
Restores a fix for unix domain socket path length limits when using the synchronous hash equivalence client that was accidentally removed when the async client was added. Unfortunately, it's much more difficult to fix the same problem when using the async client directly due to the interaction of chdir() and async code, but this will at least restore the old behavior in the synchronous case. (Bitbake rev: 53e85022a8b1c8f407c9418260c59beffb96f0f9) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/hashserv/client.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/bitbake/lib/hashserv/client.py b/bitbake/lib/hashserv/client.py
index ae5875d1b3..7bbf0865d5 100644
--- a/bitbake/lib/hashserv/client.py
+++ b/bitbake/lib/hashserv/client.py
@@ -40,7 +40,7 @@ class AsyncClient(object):
self._connect_sock = connect_sock
- async def _connect(self):
+ async def connect(self):
if self.reader is None or self.writer is None:
(self.reader, self.writer) = await self._connect_sock()
@@ -62,7 +62,7 @@ class AsyncClient(object):
count = 0
while True:
try:
- await self._connect()
+ await self.connect()
return await proc()
except (
OSError,
@@ -190,7 +190,6 @@ class Client(object):
for call in (
"connect_tcp",
- "connect_unix",
"close",
"get_unihash",
"report_unihash",
@@ -209,6 +208,16 @@ class Client(object):
return wrapper
+ def connect_unix(self, path):
+ # AF_UNIX has path length issues so chdir here to workaround
+ cwd = os.getcwd()
+ try:
+ os.chdir(os.path.dirname(path))
+ self.loop.run_until_complete(self.client.connect_unix(path))
+ self.loop.run_until_complete(self.client.connect())
+ finally:
+ os.chdir(cwd)
+
@property
def max_chunk(self):
return self.client.max_chunk