diff --git a/tests/system-test/6-cluster/5dnode3mnodeDrop.py b/tests/system-test/6-cluster/5dnode3mnodeDrop.py index b98134f5e0..e81d5295f2 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeDrop.py +++ b/tests/system-test/6-cluster/5dnode3mnodeDrop.py @@ -75,7 +75,7 @@ class TDTestCase: testCluster = False valgrind = 0 hostname = socket.gethostname() - print(hostname) + tdLog.debug(hostname) dnodes = [] start_port = 6030 start_port_sec = 6130 @@ -102,12 +102,12 @@ class TDTestCase: # create cluster for dnode in self.TDDnodes.dnodes[1:]: - # print(dnode.cfgDict) + # tdLog.debug(dnode.cfgDict) dnode_id = dnode.cfgDict["fqdn"] + ":" +dnode.cfgDict["serverPort"] dnode_first_host = dnode.cfgDict["firstEp"].split(":")[0] dnode_first_port = dnode.cfgDict["firstEp"].split(":")[-1] cmd = f" taos -h {dnode_first_host} -P {dnode_first_port} -s ' create dnode \"{dnode_id} \" ' ;" - print(cmd) + tdLog.debug(cmd) os.system(cmd) time.sleep(2) @@ -119,26 +119,26 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : if tdSql.queryResult[1][2]=='follower': if tdSql.queryResult[2][2]=='follower': - print("three mnodes is ready in 10s") + tdLog.debug("three mnodes is ready in 10s") break elif tdSql.queryResult[0][2]=='follower' : if tdSql.queryResult[1][2]=='leader': if tdSql.queryResult[2][2]=='follower': - print("three mnodes is ready in 10s") + tdLog.debug("three mnodes is ready in 10s") break elif tdSql.queryResult[0][2]=='follower' : if tdSql.queryResult[1][2]=='follower': if tdSql.queryResult[2][2]=='leader': - print("three mnodes is ready in 10s") + tdLog.debug("three mnodes is ready in 10s") break count+=1 else: - print(tdSql.queryResult) - print("three mnodes is not ready in 10s ") + tdLog.debug(tdSql.queryResult) + tdLog.debug("three mnodes is not ready in 10s ") return -1 tdSql.query("show mnodes;") @@ -156,19 +156,19 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='offline' : if tdSql.queryResult[1][2]=='leader': if tdSql.queryResult[2][2]=='follower': - print("stop mnodes on dnode 2 successfully in 10s") + tdLog.debug("stop mnodes on dnode 2 successfully in 10s") break elif tdSql.queryResult[1][2]=='follower': if tdSql.queryResult[2][2]=='leader': - print("stop mnodes on dnode 2 successfully in 10s") + tdLog.debug("stop mnodes on dnode 2 successfully in 10s") break count+=1 else: - print("stop mnodes on dnode 2 failed in 10s ") + tdLog.debug("stop mnodes on dnode 2 failed in 10s ") return -1 tdSql.error("drop mnode on dnode 1;") @@ -188,15 +188,15 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : if tdSql.queryResult[1][2]=='offline': if tdSql.queryResult[2][2]=='follower': - print("stop mnodes on dnode 2 successfully in 10s") + tdLog.debug("stop mnodes on dnode 2 successfully in 10s") break count+=1 else: - print("stop mnodes on dnode 2 failed in 10s ") + tdLog.debug("stop mnodes on dnode 2 failed in 10s ") return -1 tdSql.error("drop mnode on dnode 2;") @@ -218,15 +218,15 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : if tdSql.queryResult[2][2]=='offline': if tdSql.queryResult[1][2]=='follower': - print("stop mnodes on dnode 3 successfully in 10s") + tdLog.debug("stop mnodes on dnode 3 successfully in 10s") break count+=1 else: - print("stop mnodes on dnode 3 failed in 10s") + tdLog.debug("stop mnodes on dnode 3 failed in 10s") return -1 tdSql.error("drop mnode on dnode 3;") tdSql.query("show mnodes;") @@ -268,7 +268,7 @@ class TDTestCase: tdSql.error("drop mnode on dnode 1") tdSql.query("show dnodes;") - print(tdSql.queryResult) + tdLog.debug(tdSql.queryResult) # drop follower of mnode dropcount =0 @@ -282,7 +282,7 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(2): - print("drop mnode %d successfully"%(i+1)) + tdLog.debug("drop mnode %d successfully"%(i+1)) break count+=1 tdLog.debug("create mnode on dnode %d"%(i+1)) @@ -292,7 +292,7 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3): - print("drop mnode %d successfully"%(i+1)) + tdLog.debug("drop mnode %d successfully"%(i+1)) break count+=1 dropcount+=1 @@ -307,7 +307,7 @@ class TDTestCase: def run(self): - # print(self.master_dnode.cfgDict) + # tdLog.debug(self.master_dnode.cfgDict) self.buildcluster(5) self.five_dnode_three_mnode() diff --git a/tests/system-test/6-cluster/5dnode3mnodeStop.py b/tests/system-test/6-cluster/5dnode3mnodeStop.py index e11f819263..654b27bfc0 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeStop.py +++ b/tests/system-test/6-cluster/5dnode3mnodeStop.py @@ -99,12 +99,12 @@ class TDTestCase: # create cluster for dnode in self.TDDnodes.dnodes[1:]: - # print(dnode.cfgDict) + # tdLog.debug(dnode.cfgDict) dnode_id = dnode.cfgDict["fqdn"] + ":" +dnode.cfgDict["serverPort"] dnode_first_host = dnode.cfgDict["firstEp"].split(":")[0] dnode_first_port = dnode.cfgDict["firstEp"].split(":")[-1] cmd = f" taos -h {dnode_first_host} -P {dnode_first_port} -s ' create dnode \"{dnode_id} \" ' ;" - print(cmd) + tdLog.debug(cmd) os.system(cmd) time.sleep(2) @@ -116,25 +116,25 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : if tdSql.queryResult[1][2]=='follower': if tdSql.queryResult[2][2]=='follower': - print("three mnodes is ready in 10s") + tdLog.debug("three mnodes is ready in 10s") break elif tdSql.queryResult[0][2]=='follower' : if tdSql.queryResult[1][2]=='leader': if tdSql.queryResult[2][2]=='follower': - print("three mnodes is ready in 10s") + tdLog.debug("three mnodes is ready in 10s") break elif tdSql.queryResult[0][2]=='follower' : if tdSql.queryResult[1][2]=='follower': if tdSql.queryResult[2][2]=='leader': - print("three mnodes is ready in 10s") + tdLog.debug("three mnodes is ready in 10s") break count+=1 else: - print("three mnodes is not ready in 10s ") + tdLog.debug("three mnodes is not ready in 10s ") return -1 tdSql.query("show mnodes;") @@ -152,19 +152,19 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='offline' : if tdSql.queryResult[1][2]=='leader': if tdSql.queryResult[2][2]=='follower': - print("stop mnodes on dnode 2 successfully in 10s") + tdLog.debug("stop mnodes on dnode 2 successfully in 10s") break elif tdSql.queryResult[1][2]=='follower': if tdSql.queryResult[2][2]=='leader': - print("stop mnodes on dnode 2 successfully in 10s") + tdLog.debug("stop mnodes on dnode 2 successfully in 10s") break count+=1 else: - print("stop mnodes on dnode 2 failed in 10s ") + tdLog.debug("stop mnodes on dnode 2 failed in 10s ") return -1 tdSql.error("drop mnode on dnode 1;") @@ -184,15 +184,15 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : if tdSql.queryResult[1][2]=='offline': if tdSql.queryResult[2][2]=='follower': - print("stop mnodes on dnode 2 successfully in 10s") + tdLog.debug("stop mnodes on dnode 2 successfully in 10s") break count+=1 else: - print("stop mnodes on dnode 2 failed in 10s ") + tdLog.debug("stop mnodes on dnode 2 failed in 10s ") return -1 tdSql.error("drop mnode on dnode 2;") @@ -214,15 +214,15 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : if tdSql.queryResult[2][2]=='offline': if tdSql.queryResult[1][2]=='follower': - print("stop mnodes on dnode 3 successfully in 10s") + tdLog.debug("stop mnodes on dnode 3 successfully in 10s") break count+=1 else: - print("stop mnodes on dnode 3 failed in 10s") + tdLog.debug("stop mnodes on dnode 3 failed in 10s") return -1 tdSql.error("drop mnode on dnode 3;") tdSql.query("show mnodes;") @@ -262,7 +262,7 @@ class TDTestCase: tdSql.error("create mnode on dnode 2") tdSql.query("show dnodes;") - print(tdSql.queryResult) + tdLog.debug(tdSql.queryResult) tdLog.debug("stop and follower of mnode") self.TDDnodes.stoptaosd(2) @@ -303,7 +303,7 @@ class TDTestCase: def run(self): - # print(self.master_dnode.cfgDict) + # tdLog.debug(self.master_dnode.cfgDict) self.buildcluster(5) self.five_dnode_three_mnode(5) diff --git a/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py b/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py index ce3f2c4093..a53930faac 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py +++ b/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py @@ -77,7 +77,7 @@ class TDTestCase: for couti in range(countstart,countstop): tdLog.debug("drop database if exists db%d" %couti) tdSql.execute("drop database if exists db%d" %couti) - print("create database if not exists db%d replica 1 duration 300" %couti) + tdLog.debug("create database if not exists db%d replica 1 duration 300" %couti) tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti) tdSql.execute("use db%d" %couti) tdSql.execute( @@ -126,12 +126,12 @@ class TDTestCase: # create cluster for dnode in self.TDDnodes.dnodes[1:]: - # print(dnode.cfgDict) + # tdLog.debug(dnode.cfgDict) dnode_id = dnode.cfgDict["fqdn"] + ":" +dnode.cfgDict["serverPort"] dnode_first_host = dnode.cfgDict["firstEp"].split(":")[0] dnode_first_port = dnode.cfgDict["firstEp"].split(":")[-1] cmd = f" taos -h {dnode_first_host} -P {dnode_first_port} -s ' create dnode \"{dnode_id} \" ' ;" - print(cmd) + tdLog.debug(cmd) os.system(cmd) time.sleep(2) @@ -144,22 +144,22 @@ class TDTestCase: statusReadyBumber=0 tdSql.query("show dnodes;") if tdSql.checkRows(dnodenumber) : - print("dnode is %d nodes"%dnodenumber) + tdLog.debug("dnode is %d nodes"%dnodenumber) for i in range(dnodenumber): if tdSql.queryResult[i][4] !='ready' : status=tdSql.queryResult[i][4] - print("dnode:%d status is %s "%(i,status)) + tdLog.debug("dnode:%d status is %s "%(i,status)) break else: statusReadyBumber+=1 - print(statusReadyBumber) + tdLog.debug(statusReadyBumber) if statusReadyBumber == dnodenumber : - print("all of %d mnodes is ready in 10s "%dnodenumber) + tdLog.debug("all of %d mnodes is ready in 10s "%dnodenumber) return True break count+=1 else: - print("%d mnodes is not ready in 10s "%dnodenumber) + tdLog.debug("%d mnodes is not ready in 10s "%dnodenumber) return False @@ -169,25 +169,25 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : if tdSql.queryResult[1][2]=='follower': if tdSql.queryResult[2][2]=='follower': - print("three mnodes is ready in 10s") + tdLog.debug("three mnodes is ready in 10s") break elif tdSql.queryResult[0][2]=='follower' : if tdSql.queryResult[1][2]=='leader': if tdSql.queryResult[2][2]=='follower': - print("three mnodes is ready in 10s") + tdLog.debug("three mnodes is ready in 10s") break elif tdSql.queryResult[0][2]=='follower' : if tdSql.queryResult[1][2]=='follower': if tdSql.queryResult[2][2]=='leader': - print("three mnodes is ready in 10s") + tdLog.debug("three mnodes is ready in 10s") break count+=1 else: - print("three mnodes is not ready in 10s ") + tdLog.debug("three mnodes is not ready in 10s ") return -1 tdSql.query("show mnodes;") @@ -205,19 +205,19 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='offline' : if tdSql.queryResult[1][2]=='leader': if tdSql.queryResult[2][2]=='follower': - print("stop mnodes on dnode 2 successfully in 10s") + tdLog.debug("stop mnodes on dnode 2 successfully in 10s") break elif tdSql.queryResult[1][2]=='follower': if tdSql.queryResult[2][2]=='leader': - print("stop mnodes on dnode 2 successfully in 10s") + tdLog.debug("stop mnodes on dnode 2 successfully in 10s") break count+=1 else: - print("stop mnodes on dnode 2 failed in 10s ") + tdLog.debug("stop mnodes on dnode 2 failed in 10s ") return -1 tdSql.error("drop mnode on dnode 1;") @@ -237,15 +237,15 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : if tdSql.queryResult[1][2]=='offline': if tdSql.queryResult[2][2]=='follower': - print("stop mnodes on dnode 2 successfully in 10s") + tdLog.debug("stop mnodes on dnode 2 successfully in 10s") break count+=1 else: - print("stop mnodes on dnode 2 failed in 10s ") + tdLog.debug("stop mnodes on dnode 2 failed in 10s ") return -1 tdSql.error("drop mnode on dnode 2;") @@ -267,15 +267,15 @@ class TDTestCase: time.sleep(1) tdSql.query("show mnodes;") if tdSql.checkRows(3) : - print("mnode is three nodes") + tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : if tdSql.queryResult[2][2]=='offline': if tdSql.queryResult[1][2]=='follower': - print("stop mnodes on dnode 3 successfully in 10s") + tdLog.debug("stop mnodes on dnode 3 successfully in 10s") break count+=1 else: - print("stop mnodes on dnode 3 failed in 10s") + tdLog.debug("stop mnodes on dnode 3 failed in 10s") return -1 tdSql.error("drop mnode on dnode 3;") tdSql.query("show mnodes;") @@ -311,7 +311,7 @@ class TDTestCase: tdSql.error("create mnode on dnode 2") tdSql.query("show dnodes;") - print(tdSql.queryResult) + tdLog.debug(tdSql.queryResult) tdLog.debug("stop all of mnode ") stopcount =0 @@ -325,10 +325,10 @@ class TDTestCase: self.TDDnodes.starttaosd(i+1) if self.checkdnodes(5): - print("123") + tdLog.debug("123") threads.join() else: - print("456") + tdLog.debug("456") self.stop_thread(threads) assert 1 == 2 ,"some dnode started failed" return False @@ -345,7 +345,7 @@ class TDTestCase: def run(self): - # print(self.master_dnode.cfgDict) + # tdLog.debug(self.master_dnode.cfgDict) self.buildcluster(5) self.five_dnode_three_mnode(5)