mirror of
https://git.yoctoproject.org/poky
synced 2026-07-26 07:07:08 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
bf1521fbf1
commit
221dc50cde
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user