ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 13:07:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

continue waiting for storage-servers under more error-conditions

Browse Source
This commit is contained in:
meejah 2019-08-13 10:33:56 -06:00
parent 4dc7f9637e
commit 7225cfb18f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
integration/util.py
View File

@ -446,9 +446,12 @@ def await_client_ready(process, timeout=10, liveness=60*2):
while (time.time() - start) < float(timeout): while (time.time() - start) < float(timeout):
try: try:
data = web_get(process.node_dir, u"", params={u"t": u"json"}) data = web_get(process.node_dir, u"", params={u"t": u"json"})
except ValueError as e: js = json.loads(data)
except Exception as e:
print("waiting because '{}'".format(e)) print("waiting because '{}'".format(e))
js = json.loads(data) time.sleep(1)
continue
if len(js['servers']) == 0: if len(js['servers']) == 0:
print("waiting because no servers at all") print("waiting because no servers at all")
time.sleep(1) time.sleep(1)
@ -459,7 +462,7 @@ def await_client_ready(process, timeout=10, liveness=60*2):
] ]
# if any times are null/None that server has never been # if any times are null/None that server has never been
# contacted (so it's down still, probably) # contacted (so it's down still, probably)
if any([t is None for t in server_times]): if any(t is None for t in server_times):
print("waiting because at least one server not contacted") print("waiting because at least one server not contacted")
time.sleep(1) time.sleep(1)
continue continue