From 332727907e5d7fdbad713e1fad9a194bf0e958a8 Mon Sep 17 00:00:00 2001 From: Julien Maffre Date: Tue, 9 Mar 2021 11:53:05 +0000 Subject: [PATCH 1/2] Break early when finding primary --- tests/infra/network.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/infra/network.py b/tests/infra/network.py index 091064bb4910..5a6e66ef7459 100644 --- a/tests/infra/network.py +++ b/tests/infra/network.py @@ -695,14 +695,17 @@ def find_primary(self, timeout=3, log_capture=None): try: logs = [] res = c.get("/node/network", log_capture=logs) - if res.status_code != 200: - continue + assert res.status_code == http.HTTPStatus.OK.value, res + body = res.body.json() view = body["current_view"] if "primary_id" not in body: continue + view_change_in_progress = body["view_change_in_progress"] primary_id = body["primary_id"] + if primary_id is not None: + break except CCFConnectionException: LOG.warning( From 88b62a2ffc52ce61d438997443061cd95e404f9a Mon Sep 17 00:00:00 2001 From: Julien Maffre Date: Tue, 9 Mar 2021 11:53:25 +0000 Subject: [PATCH 2/2] Canary --- .daily_canary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.daily_canary b/.daily_canary index fd529d4f1685..5f1ccb4f0cac 100644 --- a/.daily_canary +++ b/.daily_canary @@ -1 +1 @@ -Just want to be making daily records +Just want to be making daily records.