xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-2348]reduce sleep time

This commit is contained in:
liuyq-617 2020-12-12 09:51:04 +08:00
parent b76b468ae2
commit 36f7685a15
2 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tests/pytest/update/append_commit_data.py
View File

@ -38,38 +38,62 @@ class TDTestCase:
insertRows = 200 insertRows = 200
t0 = 1604298064000 t0 = 1604298064000
sql='insert into db.t1 values '
temp=''
tdLog.info("insert %d rows" % (insertRows)) tdLog.info("insert %d rows" % (insertRows))
for i in range(0, insertRows): for i in range(0, insertRows):
ret = tdSql.execute( # ret = tdSql.execute(
'insert into t1 values (%d , 1)' % # 'insert into t1 values (%d , 1)' %
(t0+i)) # (t0+i))
temp += '(%d,1)' %(t0+i)
if i % 100 == 0 or i == (insertRows - 1 ):
print(sql+temp)
ret = tdSql.execute(
sql+temp
)
temp = ''
print("==========step2") print("==========step2")
print("restart to commit ") print("restart to commit ")
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.start(1) tdDnodes.start(1)
tdSql.query("select * from db.t1") tdSql.query("select * from db.t1")
tdSql.checkRows(insertRows) tdSql.checkRows(insertRows)
for k in range(0,100): for k in range(0,100):
tdLog.info("insert %d rows" % (insertRows)) tdLog.info("insert %d rows" % (insertRows))
temp=''
for i in range (0,insertRows): for i in range (0,insertRows):
ret = tdSql.execute( temp += '(%d,1)' %(t0+k*200+i)
'insert into db.t1 values(%d,1)' % if i % 100 == 0 or i == (insertRows - 1 ):
(t0+k*200+i) print(sql+temp)
) ret = tdSql.execute(
sql+temp
)
temp = ''
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.start(1) tdDnodes.start(1)
tdSql.query("select * from db.t1") tdSql.query("select * from db.t1")
tdSql.checkRows(insertRows+200*k) tdSql.checkRows(insertRows+200*k)
print("==========step2") print("==========step3")
print("insert into another table ") print("insert into another table ")
s = 'use db' s = 'use db'
tdSql.execute(s) tdSql.execute(s)
ret = tdSql.execute('create table t2 (ts timestamp, a int)') ret = tdSql.execute('create table t2 (ts timestamp, a int)')
insertRows = 20000 insertRows = 20000
sql = 'insert into t2 values '
temp = ''
for i in range(0, insertRows): for i in range(0, insertRows):
ret = tdSql.execute( # ret = tdSql.execute(
'insert into t2 values (%d, 1)' % # 'insert into t2 values (%d, 1)' %
(t0+i)) # (t0+i))
temp += '(%d,1)' %(t0+i)
if i % 500 == 0 or i == (insertRows - 1 ):
print(sql+temp)
ret = tdSql.execute(
sql+temp
)
temp = ''
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.start(1) tdDnodes.start(1)
tdSql.query("select * from t2") tdSql.query("select * from t2")

16
tests/pytest/util/dnodes.py
View File

@ -255,9 +255,19 @@ class TDDnode:
tdLog.exit(cmd) tdLog.exit(cmd)
self.running = 1 self.running = 1
tdLog.debug("dnode:%d is running with %s " % (self.index, cmd)) tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
time.sleep(0.1)
tdLog.debug("wait 5 seconds for the dnode:%d to start." % (self.index)) key = 'from offline to online'
time.sleep(5) bkey = bytes(key,encoding="utf8")
logFile = self.logDir + "/taosdlog.0"
popen = subprocess.Popen('tail -f ' + logFile, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
while True:
line = popen.stdout.readline().strip()
if bkey in line:
popen.kill()
break
tdLog.debug("the dnode:%d has been started." % (self.index))
# time.sleep(5)
def startWithoutSleep(self): def startWithoutSleep(self):
buildPath = self.getBuildPath() buildPath = self.getBuildPath()