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

fix: -t option and wal retention ci

This commit is contained in:
Alex Duan 2023-08-23 16:17:52 +08:00
parent ec7614449e
commit f45d1c69b8
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/system-test/0-others/walRetention.py
View File

@ -161,9 +161,18 @@ class VNode :
# get log size # get log size
def getWalsSize(self): def getWalsSize(self):
size = 0 size = 0
lastSize = 0
max = -1
for walFile in self.walFiles: for walFile in self.walFiles:
if self.canDelete(walFile) == False:
tdLog.info(f" calc vnode size {walFile.pathFile} size={walFile.fsize}")
size += walFile.fsize size += walFile.fsize
if max < walFile.startVer:
max = walFile.startVer
lastSize = walFile.fsize
size -= lastSize
tdLog.info(f" last file size need reduct . lastSize={lastSize}")
return size return size
# vnode # vnode
@ -183,7 +192,7 @@ class VNode :
delTs = delTsLine.timestamp() delTs = delTsLine.timestamp()
for walFile in self.walFiles: for walFile in self.walFiles:
mt = datetime.fromtimestamp(walFile.mtime) mt = datetime.fromtimestamp(walFile.mtime)
info = f" {walFile.pathFile} mt={mt} line={delTsLine} start={walFile.startVer} snap={self.snapVer} end= {walFile.endVer}" info = f" {walFile.pathFile} size={walFile.fsize} mt={mt} line={delTsLine} start={walFile.startVer} snap={self.snapVer} end= {walFile.endVer}"
tdLog.info(info) tdLog.info(info)
if walFile.mtime < delTs and self.canDelete(walFile): if walFile.mtime < delTs and self.canDelete(walFile):
# wait a moment then check file exist # wait a moment then check file exist
@ -199,25 +208,16 @@ class VNode :
if self.walSize == 0: if self.walSize == 0:
return True return True
time.sleep(2)
vnodeSize = self.getWalsSize() vnodeSize = self.getWalsSize()
if vnodeSize < self.walSize: # need over 20%
tdLog.info(f" wal size valid. {self.path} real = {vnodeSize} set = {self.walSize} ") if vnodeSize < self.walSize * 1.2:
tdLog.info(f" wal size valid. {self.path} real = {vnodeSize} set = {self.walSize} need over 20%")
return True return True
# check valid # check over
tdLog.info(f" wal size over set. {self.path} real = {vnodeSize} set = {self.walSize} ") tdLog.exit(f" wal size over set. {self.path} real = {vnodeSize} set = {self.walSize} ")
for walFile in self.walFiles:
if self.canDelete(walFile):
# wait a moment then check file exist
time.sleep(1)
if os.path.exists(walFile.pathFile):
tdLog.exit(f" wal file size over .\
\n wal file = {walFile.pathFile}\
\n snapVer = {self.snapVer}\
\n real = {vnodeSize} bytes\
\n set = {self.walSize} bytes")
return False return False
return True
# insert by async # insert by async

2
tools/shell/src/shellWebsocket.c
View File

@ -278,7 +278,7 @@ void shellRunSingleCommandWebsocketImp(char *command) {
} }
if (code == TSDB_CODE_WS_SEND_TIMEOUT if (code == TSDB_CODE_WS_SEND_TIMEOUT
|| code == TSDB_CODE_WS_RECV_TIMEOUT) { || code == TSDB_CODE_WS_RECV_TIMEOUT) {
fprintf(stderr, "Hint: use -t to increase the timeout in seconds\n"); fprintf(stderr, "Hint: use -T to increase the timeout in seconds\n");
} else if (code == TSDB_CODE_WS_INTERNAL_ERRO } else if (code == TSDB_CODE_WS_INTERNAL_ERRO
|| code == TSDB_CODE_WS_CLOSED) { || code == TSDB_CODE_WS_CLOSED) {
shell.ws_conn = NULL; shell.ws_conn = NULL;