From 871df0b1b4e5d5264c9cd244b02eac09a690510f Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Tue, 1 Aug 2023 15:49:44 -0400 Subject: [PATCH] Dump some more details about what we're waiting for --- integration/util.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/integration/util.py b/integration/util.py index 756489120..768741bd8 100644 --- a/integration/util.py +++ b/integration/util.py @@ -623,18 +623,22 @@ def await_client_ready(tahoe, timeout=10, liveness=60*2, minimum_number_of_serve continue now = time.time() - print( - f"Now: {time.ctime(now)}\n" - f"Server last-received-data: {[time.ctime(s['last_received_data']) for s in servers]}" - ) - server_times = [ server['last_received_data'] - for server in servers + for server + in servers + if server['last_received_data'] is not None ] + print( + f"Now: {time.ctime(now)}\n" + f"Liveness required: {liveness}\n" + f"Server last-received-data: {[time.ctime(s) for s in server_times]}\n" + f"Server ages: {[now - s for s in server_times]}\n" + ) + # check that all times are 'recent enough' (it's OK if _some_ servers # are down, we just want to make sure a sufficient number are up) - if len([now - t <= liveness for t in server_times if t is not None]) < minimum_number_of_servers: + if len([now - t <= liveness for t in server_times]) < minimum_number_of_servers: print("waiting because at least one server too old") time.sleep(1) continue