ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-18 07:18:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make await_client_ready() non-blocking.

Browse Source
This commit is contained in:
Itamar Turner-Trauring
2023-03-20 15:02:35 -04:00
parent ab300c090a
commit 61d9d82c55
6 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
integration/util.py
View File

@ -570,6 +570,10 @@ def await_client_ready(tahoe, timeout=10, liveness=60*2, minimum_number_of_serve
We will try for up to `timeout` seconds for the above conditions
to be true. Otherwise, an exception is raised
"""
return deferToThread(_await_client_ready_blocking, tahoe, timeout, liveness, minimum_number_of_servers)
def _await_client_ready_blocking(tahoe, timeout, liveness, minimum_number_of_servers):
start = time.time()
while (time.time() - start) < float(timeout):
try:
@ -792,16 +796,11 @@ async def reconfigure(reactor, request, node: TahoeProcess,
)
if changed:
# TODO reconfigure() seems to have issues on Windows. If you need to
# use it there, delete this assert and try to figure out what's going
# on...
assert not sys.platform.startswith("win")
# restart the node
print(f"Restarting {node.node_dir} for ZFEC reconfiguration")
await node.restart_async(reactor, request)
print("Restarted. Waiting for ready state.")
await_client_ready(node)
await await_client_ready(node)
print("Ready.")
else:
print("Config unchanged, not restarting.")