From 8c53e28da9b1419c68000f07b9ece1905e5d2892 Mon Sep 17 00:00:00 2001 From: lyh250-666 Date: Tue, 10 Sep 2024 09:11:27 +0800 Subject: [PATCH] modify checkdnodes error --- tests/army/cluster/clusterBasic.py | 4 ++++ tests/army/frame/clusterCommonCheck.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/army/cluster/clusterBasic.py b/tests/army/cluster/clusterBasic.py index b676eaf8f3..1ec23e56ea 100644 --- a/tests/army/cluster/clusterBasic.py +++ b/tests/army/cluster/clusterBasic.py @@ -68,6 +68,8 @@ class TDTestCase(TBase): tdSql.checkData(0, 0, leader_status) sc.dnodeStop(3) + while 1: + if clusterComCheck.checkDnodes(4): break while 1: leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar) if leader_status >= 0: break @@ -76,6 +78,8 @@ class TDTestCase(TBase): tdSql.checkData(0, 0, leader_status) sc.dnodeStop(2) + while 1: + if clusterComCheck.checkDnodes(3): break while 1: leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar) if leader_status >= 0: break diff --git a/tests/army/frame/clusterCommonCheck.py b/tests/army/frame/clusterCommonCheck.py index 771a51af2c..9cbac776b9 100644 --- a/tests/army/frame/clusterCommonCheck.py +++ b/tests/army/frame/clusterCommonCheck.py @@ -44,7 +44,7 @@ class ClusterComCheck: tdSql.query("select * from information_schema.ins_dnodes") # tdLog.debug(tdSql.res) status=0 - for i in range(dnodeNumbers): + for i in range(len(tdSql.res)): if tdSql.res[i][4] == "ready": status+=1 # tdLog.info(status)