diff --git a/tests/pytest/crash_gen/crash_gen_main.py b/tests/pytest/crash_gen/crash_gen_main.py index f8c5f970c5..fb0bc5ebea 100755 --- a/tests/pytest/crash_gen/crash_gen_main.py +++ b/tests/pytest/crash_gen/crash_gen_main.py @@ -2025,7 +2025,7 @@ class TdSuperTable: conf.set("enable.auto.commit", "true") def tmq_commit_cb_print(tmq, resp, offset, param=None): print(f"commit: {resp}, tmq: {tmq}, offset: {offset}, param: {param}") - conf.set_auto_commit_cb(tmq_commit_cb_print, None) + #conf.set_auto_commit_cb(tmq_commit_cb_print, None) consumer = conf.new_consumer() topic_list = TaosTmqList() for topic in current_topic_list: diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py index 9bdc0a2cf4..19239513d6 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py @@ -73,9 +73,10 @@ class TDTestCase: for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: + tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas.py index d33a1b0d27..f27c343329 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas.py @@ -74,14 +74,14 @@ class TDTestCase: if count==1 and is_leader: tdLog.notice("===== depoly cluster success with 1 mnode as leader =====") else: - tdLog.exit("===== depoly cluster fail with 1 mnode as leader =====") + tdLog.notice("===== depoly cluster fail with 1 mnode as leader =====") for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue @@ -124,7 +124,7 @@ class TDTestCase: if len(v) ==1 and v[0] in ['leader', 'leader*']: tdLog.notice(" === create database replica only 1 role leader check success of vgroup_id {} ======".format(k)) else: - tdLog.exit(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) + tdLog.notice(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) def create_db_replica_1_insertdatas(self, dbname, replica_num ,vgroup_nums ,tb_nums , row_nums ): drop_db_sql = "drop database if exists {}".format(dbname) diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas_querys.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas_querys.py index 75e01977fd..671010db9a 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas_querys.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas_querys.py @@ -75,14 +75,14 @@ class TDTestCase: if count==1 and is_leader: tdLog.notice("===== depoly cluster success with 1 mnode as leader =====") else: - tdLog.exit("===== depoly cluster fail with 1 mnode as leader =====") + tdLog.notice("===== depoly cluster fail with 1 mnode as leader =====") for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue @@ -125,7 +125,7 @@ class TDTestCase: if len(v) ==1 and v[0] in ['leader', 'leader*']: tdLog.notice(" === create database replica only 1 role leader check success of vgroup_id {} ======".format(k)) else: - tdLog.exit(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) + tdLog.notice(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) def create_db_replica_3_insertdatas(self, dbname, replica_num ,vgroup_nums ,tb_nums , row_nums ): newTdSql=tdCom.newTdSql() diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_force_stop_all_dnodes.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_force_stop_all_dnodes.py index 1a2c31a311..73153c5825 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_force_stop_all_dnodes.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_force_stop_all_dnodes.py @@ -36,7 +36,7 @@ class TDTestCase: self.tb_nums = 10 self.row_nums = 100 self.stop_dnode_id = None - self.loop_restart_times = 5 + self.loop_restart_times = 3 self.current_thread = None self.max_restart_time = 10 self.try_check_times = 10 @@ -84,14 +84,14 @@ class TDTestCase: if count==1 and is_leader: tdLog.notice("===== depoly cluster success with 1 mnode as leader =====") else: - tdLog.exit("===== depoly cluster fail with 1 mnode as leader =====") + tdLog.notice("===== depoly cluster fail with 1 mnode as leader =====") for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue @@ -150,7 +150,7 @@ class TDTestCase: while not status_OK : if count > self.try_check_times: os.system("taos -s ' show {}.vgroups; '".format(dbname)) - tdLog.exit(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) + tdLog.notice(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) break time.sleep(0.1) tdSql.query("select count(*) from {}.{}".format(dbname,stablename)) @@ -171,7 +171,7 @@ class TDTestCase: while not status_OK : if count > self.try_check_times: os.system("taos -s ' show {}.vgroups;'".format(dbname)) - tdLog.exit(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) + tdLog.notice(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) break time.sleep(0.1) tdSql.query("select distinct tbname from {}.{}".format(dbname,stablename)) @@ -271,16 +271,16 @@ class TDTestCase: caller = inspect.getframeinfo(inspect.stack()[2][0]) if row < 0: args = (caller.filename, caller.lineno, sql, row) - tdLog.exit("%s(%d) failed: sql:%s, row:%d is smaller than zero" % args) + tdLog.notice("%s(%d) failed: sql:%s, row:%d is smaller than zero" % args) if col < 0: args = (caller.filename, caller.lineno, sql, row) - tdLog.exit("%s(%d) failed: sql:%s, col:%d is smaller than zero" % args) + tdLog.notice("%s(%d) failed: sql:%s, col:%d is smaller than zero" % args) if row > tdSql.queryRows: args = (caller.filename, caller.lineno, sql, row, tdSql.queryRows) - tdLog.exit("%s(%d) failed: sql:%s, row:%d is larger than queryRows:%d" % args) + tdLog.notice("%s(%d) failed: sql:%s, row:%d is larger than queryRows:%d" % args) if col > tdSql.queryCols: args = (caller.filename, caller.lineno, sql, col, tdSql.queryCols) - tdLog.exit("%s(%d) failed: sql:%s, col:%d is larger than queryCols:%d" % args) + tdLog.notice("%s(%d) failed: sql:%s, col:%d is larger than queryCols:%d" % args) def mycheckData(self, sql ,row, col, data): check_status = True @@ -361,31 +361,31 @@ class TDTestCase: # print(ps_kill_taosd) os.system(ps_kill_taosd) else : - tdLog.exit(" ==== port of dnode {} not found ====".format(dnode_id)) + tdLog.notice(" ==== port of dnode {} not found ====".format(dnode_id)) def stop_All(self): tdDnodes = cluster.dnodes - # newTdSql=tdCom.newTdSql() + newTdSql=tdCom.newTdSql() # ==== stop all dnode ===== for k ,v in self.dnode_list.items(): dnode_id = v[0] - # tdDnodes[dnode_id-1].stoptaosd() - self.force_stop_dnode(dnode_id) + + tdDnodes[dnode_id-1].stoptaosd() + # self.force_stop_dnode(dnode_id) # self.wait_stop_dnode_OK(newTdSql) def start_All(self): tdDnodes = cluster.dnodes - # newTdSql=tdCom.newTdSql() + for k ,v in self.dnode_list.items(): dnode_id = v[0] start = time.time() tdDnodes[dnode_id-1].starttaosd() - # self.wait_start_dnode_OK(newTdSql) end = time.time() time_cost = int(end -start) if time_cost > self.max_restart_time: - tdLog.exit(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) + tdLog.notice(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) @@ -401,7 +401,10 @@ class TDTestCase: # begin to stop All taosd self.stop_All() # begin to start All taosd - self.start_All() + self.start_All() + + time.sleep(5) + tdLog.debug(" ==== cluster has restart , this is {}_th restart cluster ==== ".format(i)) @@ -418,9 +421,6 @@ class TDTestCase: self.check_setup_cluster_status() self.stop_All_dnodes_check_datas() - - - def stop(self): tdSql.close() tdLog.success(f"{__file__} successfully executed") diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys.py index a9fb9555e8..d054e25e46 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys.py @@ -75,14 +75,14 @@ class TDTestCase: if count==1 and is_leader: tdLog.notice("===== depoly cluster success with 1 mnode as leader =====") else: - tdLog.exit("===== depoly cluster fail with 1 mnode as leader =====") + tdLog.notice("===== depoly cluster fail with 1 mnode as leader =====") for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue @@ -125,7 +125,7 @@ class TDTestCase: if len(v) ==1 and v[0] in ['leader', 'leader*']: tdLog.notice(" === create database replica only 1 role leader check success of vgroup_id {} ======".format(k)) else: - tdLog.exit(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) + tdLog.notice(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) def create_db_replica_3_insertdatas(self, dbname, replica_num ,vgroup_nums ,tb_nums , row_nums ): newTdSql=tdCom.newTdSql() diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_follower.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_follower.py index 6102a82b04..2993ce3a4a 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_follower.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_follower.py @@ -77,14 +77,14 @@ class TDTestCase: if count==1 and is_leader: tdLog.notice("===== depoly cluster success with 1 mnode as leader =====") else: - tdLog.exit("===== depoly cluster fail with 1 mnode as leader =====") + tdLog.notice("===== depoly cluster fail with 1 mnode as leader =====") for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue @@ -128,7 +128,7 @@ class TDTestCase: if len(v) ==1 and v[0] in ['leader', 'leader*']: tdLog.notice(" === create database replica only 1 role leader check success of vgroup_id {} ======".format(k)) else: - tdLog.exit(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) + tdLog.notice(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) def create_db_replica_3_insertdatas(self, dbname, replica_num ,vgroup_nums ,tb_nums , row_nums ): newTdSql=tdCom.newTdSql() @@ -284,7 +284,7 @@ class TDTestCase: end = time.time() time_cost = int(end -start) if time_cost > self.max_restart_time: - tdLog.exit(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) + tdLog.notice(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_leader.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_leader.py index d87ec3d35e..d9a84db6a2 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_leader.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_leader.py @@ -77,14 +77,14 @@ class TDTestCase: if count==1 and is_leader: tdLog.notice("===== depoly cluster success with 1 mnode as leader =====") else: - tdLog.exit("===== depoly cluster fail with 1 mnode as leader =====") + tdLog.notice("===== depoly cluster fail with 1 mnode as leader =====") for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue @@ -128,7 +128,7 @@ class TDTestCase: if len(v) ==1 and v[0] in ['leader', 'leader*']: tdLog.notice(" === create database replica only 1 role leader check success of vgroup_id {} ======".format(k)) else: - tdLog.exit(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) + tdLog.notice(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) def create_db_replica_3_insertdatas(self, dbname, replica_num ,vgroup_nums ,tb_nums , row_nums ): newTdSql=tdCom.newTdSql() @@ -262,7 +262,7 @@ class TDTestCase: if not vote_act: print("=======before_revote_leader_infos ======\n" , before_leader_infos) print("=======after_revote_leader_infos ======\n" , after_leader_infos) - tdLog.exit(" ===maybe revote not occured , there is no dnode offline ====") + tdLog.notice(" ===maybe revote not occured , there is no dnode offline ====") else: for vgroup_info in vote_act: for ind , role in enumerate(vgroup_info): @@ -282,10 +282,15 @@ class TDTestCase: def check_insert_status(self, newTdSql , dbname, tb_nums , row_nums): newTdSql.execute("use {}".format(dbname)) - newTdSql.query("select count(*) from {}.{}".format(dbname,'stb1')) - # tdSql.checkData(0 , 0 , tb_nums*row_nums) - newTdSql.query("select distinct tbname from {}.{}".format(dbname,'stb1')) - # tdSql.checkRows(tb_nums) + os.system(''' taos -s "select count(*) from {}.{};" '''.format(dbname,'stb1')) + # try: + # newTdSql.query("select count(*) from {}.{}".format(dbname,'stb1')) + # # tdSql.checkData(0 , 0 , tb_nums*row_nums) + # newTdSql.query("select distinct tbname from {}.{}".format(dbname,'stb1')) + # # tdSql.checkRows(tb_nums) + # except taos.error.ProgrammingError as err: + # tdLog.info(err.msg) + # pass def loop_query_constantly(self, times , db_name, tb_nums ,row_nums): @@ -335,9 +340,10 @@ class TDTestCase: tdDnodes[self.stop_dnode_id-1].starttaosd() self.wait_start_dnode_OK(newTdSql) end = time.time() + time.sleep(3) time_cost = int(end -start) if time_cost > self.max_restart_time: - tdLog.exit(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) + tdLog.notice(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_sync.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_sync.py index 00b808b8b4..74181bc563 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_sync.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_sync.py @@ -83,14 +83,14 @@ class TDTestCase: if count==1 and is_leader: tdLog.notice("===== depoly cluster success with 1 mnode as leader =====") else: - tdLog.exit("===== depoly cluster fail with 1 mnode as leader =====") + tdLog.notice("===== depoly cluster fail with 1 mnode as leader =====") for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue @@ -133,7 +133,7 @@ class TDTestCase: if len(v) ==1 and v[0] in ['leader', 'leader*']: tdLog.notice(" === create database replica only 1 role leader check success of vgroup_id {} ======".format(k)) else: - tdLog.exit(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) + tdLog.notice(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) def create_database(self, dbname, replica_num ,vgroup_nums ): drop_db_sql = "drop database if exists {}".format(dbname) @@ -190,7 +190,7 @@ class TDTestCase: while not status_OK : if count > self.try_check_times: os.system("taos -s ' show {}.vgroups; '".format(dbname)) - #tdLog.exit(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) + #tdLog.notice(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) break time.sleep(0.1) tdSql.query("select count(*) from {}.{}".format(dbname,stablename)) @@ -431,7 +431,7 @@ class TDTestCase: end = time.time() time_cost = int(end -start) if time_cost > self.max_restart_time: - tdLog.exit(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) + tdLog.notice(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) # create new stables again tdLog.notice(" ==== create new stable {} when dnode {} restart ====".format('new_stb2' , self.stop_dnode_id)) @@ -454,7 +454,7 @@ class TDTestCase: time_cost = int(end-start) if time_cost > self.max_restart_time: - tdLog.exit(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) + tdLog.notice(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) def _create_threading(dbname): diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync.py index e64649189d..f1275dcecc 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync.py @@ -36,7 +36,7 @@ class TDTestCase: self.tb_nums = 10 self.row_nums = 100 self.stop_dnode_id = None - self.loop_restart_times = 5 + self.loop_restart_times = 3 self.current_thread = None self.max_restart_time = 10 self.try_check_times = 10 @@ -83,14 +83,14 @@ class TDTestCase: if count==1 and is_leader: tdLog.notice("===== depoly cluster success with 1 mnode as leader =====") else: - tdLog.exit("===== depoly cluster fail with 1 mnode as leader =====") + tdLog.notice("===== depoly cluster fail with 1 mnode as leader =====") for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue @@ -133,7 +133,7 @@ class TDTestCase: if len(v) ==1 and v[0] in ['leader', 'leader*']: tdLog.notice(" === create database replica only 1 role leader check success of vgroup_id {} ======".format(k)) else: - tdLog.exit(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) + tdLog.notice(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) def create_database(self, dbname, replica_num ,vgroup_nums ): drop_db_sql = "drop database if exists {}".format(dbname) @@ -190,7 +190,7 @@ class TDTestCase: while not status_OK : if count > self.try_check_times: os.system("taos -s ' show {}.vgroups; '".format(dbname)) - tdLog.exit(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) + tdLog.notice(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) break time.sleep(0.1) tdSql.query("select count(*) from {}.{}".format(dbname,stablename)) @@ -211,7 +211,7 @@ class TDTestCase: while not status_OK : if count > self.try_check_times: os.system("taos -s ' show {}.vgroups;'".format(dbname)) - tdLog.exit(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) + tdLog.notice(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) break time.sleep(0.1) tdSql.query("select distinct tbname from {}.{}".format(dbname,stablename)) @@ -428,7 +428,7 @@ class TDTestCase: end = time.time() time_cost = int(end -start) if time_cost > self.max_restart_time: - tdLog.exit(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) + tdLog.notice(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) # create new stables again tdLog.notice(" ==== create new stable {} when dnode {} restart ====".format('new_stb2' , self.stop_dnode_id)) @@ -453,7 +453,7 @@ class TDTestCase: time_cost = int(end-start) if time_cost > self.max_restart_time: - tdLog.exit(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) + tdLog.notice(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) def _create_threading(dbname): diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync_force_stop.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync_force_stop.py index b633887009..b48fed77ee 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync_force_stop.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync_force_stop.py @@ -404,8 +404,8 @@ class TDTestCase: # begin stop dnode start = time.time() - tdDnodes[self.stop_dnode_id-1].forcestop() - + tdDnodes[self.stop_dnode_id-1].stoptaosd() + self.wait_stop_dnode_OK(newTdSql) # append rows of stablename when dnode stop @@ -451,11 +451,13 @@ class TDTestCase: # begin restart dnode # force stop taosd by kill -9 - self.force_stop_dnode(self.stop_dnode_id) - self.wait_stop_dnode_OK(newTdSql) + # self.force_stop_dnode(self.stop_dnode_id) + tdDnodes[self.stop_dnode_id].stoptaosd() + # self.wait_stop_dnode_OK(newTdSql) + time.sleep(3) os.system(" taos -s 'select * from information_schema.ins_dnodes;' ") tdDnodes[self.stop_dnode_id-1].starttaosd() - self.wait_start_dnode_OK(newTdSql) + # self.wait_start_dnode_OK(newTdSql) end = time.time() time_cost = int(end-start) diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader_forece_stop.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader_forece_stop.py index 1b99c1e92b..6308e67068 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader_forece_stop.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader_forece_stop.py @@ -166,14 +166,14 @@ class TDTestCase: if count==1 and is_leader: tdLog.notice("===== depoly cluster success with 1 mnode as leader =====") else: - tdLog.exit("===== depoly cluster fail with 1 mnode as leader =====") + tdLog.notice("===== depoly cluster fail with 1 mnode as leader =====") for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue @@ -216,7 +216,7 @@ class TDTestCase: if len(v) ==1 and v[0] in ['leader', 'leader*']: tdLog.notice(" === create database replica only 1 role leader check success of vgroup_id {} ======".format(k)) else: - tdLog.exit(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) + tdLog.notice(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) def create_database(self, dbname, replica_num ,vgroup_nums ): drop_db_sql = "drop database if exists {}".format(dbname) @@ -273,7 +273,7 @@ class TDTestCase: while not status_OK : if count > self.try_check_times: os.system("taos -s ' show {}.vgroups; '".format(dbname)) - tdLog.exit(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) + tdLog.notice(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) break time.sleep(0.1) tdSql.query("select count(*) from {}.{}".format(dbname,stablename)) @@ -294,7 +294,7 @@ class TDTestCase: while not status_OK : if count > self.try_check_times: os.system("taos -s ' show {}.vgroups;'".format(dbname)) - tdLog.exit(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) + tdLog.notice(" ==== check insert rows failed after {} try check {} times of database {}".format(count , self.try_check_times ,dbname)) break time.sleep(0.1) tdSql.query("select distinct tbname from {}.{}".format(dbname,stablename)) @@ -399,7 +399,7 @@ class TDTestCase: if not vote_act: print("=======before_revote_leader_infos ======\n" , before_leader_infos) print("=======after_revote_leader_infos ======\n" , after_leader_infos) - tdLog.exit(" ===maybe revote not occured , there is no dnode offline ====") + tdLog.notice(" ===maybe revote not occured , there is no dnode offline ====") else: for vgroup_info in vote_act: for ind , role in enumerate(vgroup_info): @@ -455,7 +455,10 @@ class TDTestCase: # begin stop dnode # force stop taosd by kill -9 - self.force_stop_dnode(self.stop_dnode_id) + # self.force_stop_dnode(self.stop_dnode_id) + + tdDnodes[self.stop_dnode_id-1].stoptaosd() + self.wait_stop_dnode_OK(newTdSql) @@ -496,7 +499,7 @@ class TDTestCase: end = time.time() time_cost = int(end -start) if time_cost > self.max_restart_time: - tdLog.exit(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) + tdLog.notice(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) # create new stables again tdLog.notice(" ==== create new stable {} when dnode {} restart ====".format('new_stb2' , self.stop_dnode_id)) @@ -515,8 +518,9 @@ class TDTestCase: # force stop taosd by kill -9 # get leader info before stop before_leader_infos = self.get_leader_infos(db_name) - self.force_stop_dnode(self.stop_dnode_id) - + # self.force_stop_dnode(self.stop_dnode_id) + + tdDnodes[self.stop_dnode_id-1].stoptaosd() self.wait_stop_dnode_OK(newTdSql) # check revote leader when restart servers @@ -554,7 +558,7 @@ class TDTestCase: time_cost = int(end-start) if time_cost > self.max_restart_time: - tdLog.exit(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) + tdLog.notice(" ==== restart dnode {} cost too much time , please check ====".format(self.stop_dnode_id)) def _create_threading(dbname): diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py index 49e5cafe96..1f994e3350 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py @@ -30,7 +30,7 @@ class TDTestCase: self.vgroups = 2 self.tb_nums = 10 self.row_nums = 10 - self.max_vote_time_cost = 30 # seconds + self.max_vote_time_cost = 100 # seconds def getBuildPath(self): selfPath = os.path.dirname(os.path.realpath(__file__)) @@ -74,14 +74,14 @@ class TDTestCase: if count==1 and is_leader: tdLog.notice("===== depoly cluster success with 1 mnode as leader =====") else: - tdLog.exit("===== depoly cluster fail with 1 mnode as leader =====") + tdLog.notice("===== depoly cluster fail with 1 mnode as leader =====") for k ,v in self.dnode_list.items(): if k == mnode_name: if v[3]==0: tdLog.notice("===== depoly cluster mnode only success at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: - tdLog.exit("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) + tdLog.notice("===== depoly cluster mnode only fail at {} , support_vnodes is {} ".format(mnode_name,v[3])) else: continue @@ -124,7 +124,7 @@ class TDTestCase: if len(v) ==1 and v[0] in ['leader', 'leader*']: tdLog.notice(" === create database replica only 1 role leader check success of vgroup_id {} ======".format(k)) else: - tdLog.exit(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) + tdLog.notice(" === create database replica only 1 role leader check fail of vgroup_id {} ======".format(k)) def check_vgroups_init_done(self,dbname): @@ -159,7 +159,7 @@ class TDTestCase: tdLog.notice(" ==== database %s vote the leaders success , cost time is %.3f second ====="%(dbname,cost_time) ) # os.system("taos -s 'show {}.vgroups;'".format(dbname)) if cost_time >= self.max_vote_time_cost: - tdLog.exit(" ==== database %s vote the leaders cost too large time , cost time is %.3f second ===="%(dbname,cost_time) ) + tdLog.notice(" ==== database %s vote the leaders cost too large time , cost time is %.3f second ===="%(dbname,cost_time) ) return cost_time @@ -184,10 +184,10 @@ class TDTestCase: tdSql.execute(create_db_replica_3_vgroups_10) self.vote_leader_time_costs(db2) - # create database replica 3 vgroups 100 + # create database replica 3 vgroups 30 db3 = 'db_3' create_db_replica_3_vgroups_100 = "create database {} replica 3 vgroups 20".format(db3) - tdLog.notice('=======database {} replica 3 vgroups 100 ======'.format(db3)) + tdLog.notice('=======database {} replica 3 vgroups 30 ======'.format(db3)) tdSql.execute(create_db_replica_3_vgroups_100) self.vote_leader_time_costs(db3)