Merge branch 'develop' of github.com:taosdata/TDengine into dev/chr

tests/pytest/alter/alter_keep.py

@@ -15,6 +15,7 @@ import sys
 from util.log import *
 from util.cases import *
 from util.sql import *
+import time
 
 
 class TDTestCase:
@@ -129,9 +130,6 @@ class TDTestCase:
 
         tdSql.prepare()
 
-        ##TODO: need to wait for TD-4445 to implement the following
-        ##      tests
-
 
         ## preset the keep
         tdSql.prepare()
@@ -178,18 +176,20 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         
         tdLog.notice('testing keep will be altered if sudden change from small to big')
+        for i in range(30):
             tdSql.execute('alter database db keep 14,14,14')
-        tdSql.execute('alter database db keep 15,15,15')
+            tdSql.execute('alter database db keep 16,16,16')
             tdSql.execute('insert into tb values (now-15d, 10)')
             tdSql.query('select * from tb')
-        tdSql.checkRows(rowNum + 1)
+            rowNum += 1
+            tdSql.checkRows(rowNum )
 
         tdLog.notice('testing keep will be altered if sudden change from big to small')
         tdSql.execute('alter database db keep 16,16,16')
         tdSql.execute('alter database db keep 14,14,14')
         tdSql.error('insert into tb values (now-15d, 10)')
         tdSql.query('select * from tb')
-        tdSql.checkRows(rowNum + 1)
+        tdSql.checkRows(rowNum)
 
 
 

tests/pytest/client/change_time_1_1.py

@@ -19,6 +19,7 @@ from util.pathFinding import *
 from util.dnodes import tdDnodes
 from datetime import datetime
 import subprocess
+import time
 
 ##TODO: this is now automatic, but not sure if this will run through jenkins
 class TDTestCase:
@@ -34,24 +35,36 @@ class TDTestCase:
 
         ## change system time to 2020/10/20
         os.system('sudo timedatectl set-ntp off')
+        tdLog.sleep(10)
         os.system('sudo timedatectl set-time 2020-10-20')
 
         #run taosdemo to insert data. one row per second from 2020/10/11 to 2020/10/20
         #11 data files should be generated
         #vnode at TDinternal/community/sim/dnode1/data/vnode
+        try:
             os.system(f"{binPath}taosdemo -f tools/taosdemoAllTest/manual_change_time_1_1_A.json")
             commandArray = ['ls', '-l', f'{TDenginePath}/sim/dnode1/data/vnode/vnode2/tsdb/data']
             result = subprocess.run(commandArray, stdout=subprocess.PIPE).stdout.decode('utf-8')
-        print(result.count('data'))
+        except BaseException:
+            os.system('sudo timedatectl set-ntp on')
+            tdLog.sleep(10)
         if result.count('data') != 11:
+            os.system('sudo timedatectl set-ntp on')
+            tdLog.sleep(10)
             tdLog.exit('wrong number of files')
         else:
             tdLog.debug("data file number correct")
         
         #move 5 days ahead to 2020/10/25. 4 oldest files should be removed during the new write
         #leaving 7 data files.
+        try:
             os.system ('timedatectl set-time 2020-10-25')
             os.system(f"{binPath}taosdemo -f tools/taosdemoAllTest/manual_change_time_1_1_B.json")
+        except BaseException:
+            os.system('sudo timedatectl set-ntp on')
+            tdLog.sleep(10)
+        os.system('sudo timedatectl set-ntp on') 
+        tdLog.sleep(10)
         commandArray = ['ls', '-l', f'{TDenginePath}/sim/dnode1/data/vnode/vnode2/tsdb/data']
         result = subprocess.run(commandArray, stdout=subprocess.PIPE).stdout.decode('utf-8')
         print(result.count('data'))
@@ -61,9 +74,12 @@ class TDTestCase:
             tdLog.debug("data file number correct")
         tdSql.query('select first(ts) from stb_0')
         tdSql.checkData(0,0,datetime(2020,10,14,8,0,0,0)) #check the last data in the database
+        os.system('sudo timedatectl set-ntp on')
+        tdLog.sleep(10)
 
     def stop(self):
         os.system('sudo timedatectl set-ntp on')
+        tdLog.sleep(10)
         tdSql.close()
         tdLog.success("alter block manual check finish")
 

tests/pytest/client/change_time_1_2.py

@@ -34,34 +34,52 @@ class TDTestCase:
 
         ## change system time to 2020/10/20
         os.system ('timedatectl set-ntp off')
+        tdLog.sleep(10)
         os.system ('timedatectl set-time 2020-10-20')
 
         #run taosdemo to insert data. one row per second from 2020/10/11 to 2020/10/20
         #11 data files should be generated
         #vnode at TDinternal/community/sim/dnode1/data/vnode
+        try:
             os.system(f"{binPath}taosdemo -f tools/taosdemoAllTest/manual_change_time_1_1_A.json") 
             commandArray = ['ls', '-l', f'{TDenginePath}/sim/dnode1/data/vnode/vnode2/tsdb/data']
             result = subprocess.run(commandArray, stdout=subprocess.PIPE).stdout.decode('utf-8')
-        print(result.count('data'))
+        except BaseException:
+            os.system('sudo timedatectl set-ntp on')
+            tdLog.sleep(10) 
+
         if result.count('data') != 11:
+            os.system('sudo timedatectl set-ntp on')
+            tdLog.sleep(10)
             tdLog.exit('wrong number of files')
         else:
             tdLog.debug("data file number correct")
 
+
+        try:
             tdSql.query('select first(ts) from stb_0') #check the last data in the database
             tdSql.checkData(0,0,datetime(2020,10,11,0,0,0,0))
-
-        os.system ('timedatectl set-time 2020-10-25')
+        except BaseException:
+            os.system('sudo timedatectl set-ntp on')
+            tdLog.sleep(10) 
 
         #moves 5 days ahead to 2020/10/25 and restart taosd
         #4 oldest data file should be removed from tsdb/data
         #7 data file should be found 
         #vnode at TDinternal/community/sim/dnode1/data/vnode
+
+        try:
             os.system ('timedatectl set-time 2020-10-25')
             tdDnodes.stop(1)
             tdDnodes.start(1)
             tdSql.query('select first(ts) from stb_0')
             tdSql.checkData(0,0,datetime(2020,10,14,8,0,0,0)) #check the last data in the database
+        except BaseException:
+            os.system('sudo timedatectl set-ntp on')
+            tdLog.sleep(10) 
+
+        os.system('sudo timedatectl set-ntp on')
+        tdLog.sleep(10)
         commandArray = ['ls', '-l', f'{TDenginePath}/sim/dnode1/data/vnode/vnode2/tsdb/data']
         result = subprocess.run(commandArray, stdout=subprocess.PIPE).stdout.decode('utf-8')
         print(result.count('data'))
@@ -69,8 +87,8 @@ class TDTestCase:
             tdLog.exit('wrong number of files')
         else:
             tdLog.debug("data file number correct")
-
-
+        os.system('sudo timedatectl set-ntp on')
+        tdLog.sleep(10)
 
     def stop(self):
         os.system('sudo timedatectl set-ntp on')

tests/pytest/fulltest.sh

@@ -257,8 +257,8 @@ python3 ./test.py -f client/client.py
 python3 ./test.py -f client/version.py
 python3 ./test.py -f client/alterDatabase.py
 python3 ./test.py -f client/noConnectionErrorTest.py
-#python3 test.py -f client/change_time_1_1.py
-#python3 test.py -f client/change_time_1_2.py
+# python3 test.py -f client/change_time_1_1.py
+# python3 test.py -f client/change_time_1_2.py
 
 # Misc
 python3 testCompress.py
@@ -342,7 +342,7 @@ python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
 python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
 python3 ./test.py -f tag_lite/drop_auto_create.py
 python3 test.py -f insert/insert_before_use_db.py
-#python3 test.py -f alter/alter_keep.py
+python3 test.py -f alter/alter_keep.py
 python3 test.py -f alter/alter_cacheLastRow.py
 python3 ./test.py -f query/querySession.py 
 python3 test.py -f  alter/alter_create_exception.py