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

Merge remote-tracking branch 'origin/main' into fix/TS-2349

This commit is contained in:
Shengliang Guan 2022-12-30 20:04:13 +08:00
parent 01209614e6 3a11c62243
commit 2432a56a53
7 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/cmake.version
View File

@ -2,7 +2,7 @@
IF (DEFINED VERNUMBER) IF (DEFINED VERNUMBER)
SET(TD_VER_NUMBER ${VERNUMBER}) SET(TD_VER_NUMBER ${VERNUMBER})
ELSE () ELSE ()
SET(TD_VER_NUMBER "3.0.2.1") SET(TD_VER_NUMBER "3.0.2.2")
ENDIF () ENDIF ()
IF (DEFINED VERCOMPATIBLE) IF (DEFINED VERCOMPATIBLE)

2
cmake/taosadapter_CMakeLists.txt.in
View File

@ -2,7 +2,7 @@
# taosadapter # taosadapter
ExternalProject_Add(taosadapter ExternalProject_Add(taosadapter
GIT_REPOSITORY https://github.com/taosdata/taosadapter.git GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
GIT_TAG 5662a6d GIT_TAG a2e9920
SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter" SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
BINARY_DIR "" BINARY_DIR ""
#BUILD_IN_SOURCE TRUE #BUILD_IN_SOURCE TRUE

1
source/libs/stream/src/streamMeta.c
View File

@ -294,6 +294,7 @@ int32_t streamLoadTasks(SStreamMeta* pMeta) {
tdbTbcClose(pCur); tdbTbcClose(pCur);
return -1; return -1;
} }
pTask->taskStatus = TASK_STATUS__NORMAL;
} }
tdbFree(pKey); tdbFree(pKey);

2
source/libs/stream/src/streamState.c
View File

@ -107,7 +107,7 @@ static inline int stateKeyCmpr(const void* pKey1, int kLen1, const void* pKey2,
} }
SStreamState* streamStateOpen(char* path, SStreamTask* pTask, bool specPath, int32_t szPage, int32_t pages) { SStreamState* streamStateOpen(char* path, SStreamTask* pTask, bool specPath, int32_t szPage, int32_t pages) {
szPage = szPage < 0 ? (16 * 1024) : szPage; szPage = szPage < 0 ? 4096 : szPage;
pages = pages < 0 ? 256 : pages; pages = pages < 0 ? 256 : pages;
SStreamState* pState = taosMemoryCalloc(1, sizeof(SStreamState)); SStreamState* pState = taosMemoryCalloc(1, sizeof(SStreamState));
if (pState == NULL) { if (pState == NULL) {

17
tests/pytest/auto_crash_gen.py
View File

@ -324,7 +324,7 @@ def main():
print( " crash_gen.sh is not exists ") print( " crash_gen.sh is not exists ")
sys.exit(1) sys.exit(1)
git_commit = subprocess.Popen("cd %s && git log | head -n1"%crash_gen_path, shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")[8:16] git_commit = subprocess.Popen("cd %s && git log | head -n1"%crash_gen_path, shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")[7:16]
# crash_cmds = get_cmds() # crash_cmds = get_cmds()
@ -348,15 +348,12 @@ def main():
else: else:
print('======== crash_gen run sucess and exit as expected ========') print('======== crash_gen run sucess and exit as expected ========')
try:
if status!=0 : text = f"crash_gen instance exit status of docker [ {hostname} ] is : {msg_dict[status]}\n " + f" and git commit : {git_commit}"
send_msg(get_msg(text))
try: except Exception as e:
text = f"crash_gen instance exit status of docker [ {hostname} ] is : {msg_dict[status]}\n " + f" and git commit : {git_commit}" print("exception:", e)
send_msg(get_msg(text)) exit(status)
except Exception as e:
print("exception:", e)
exit(status)
if __name__ == '__main__': if __name__ == '__main__':

16
tests/pytest/auto_crash_gen_valgrind.py
View File

@ -357,7 +357,7 @@ def main():
print( " crash_gen.sh is not exists ") print( " crash_gen.sh is not exists ")
sys.exit(1) sys.exit(1)
git_commit = subprocess.Popen("cd %s && git log | head -n1"%crash_gen_path, shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")[8:16] git_commit = subprocess.Popen("cd %s && git log | head -n1"%crash_gen_path, shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")[7:16]
# crash_cmds = get_cmds() # crash_cmds = get_cmds()
@ -383,14 +383,12 @@ def main():
else: else:
print('======== crash_gen run sucess and exit as expected ========') print('======== crash_gen run sucess and exit as expected ========')
if status!=0 : try:
text = f"crash_gen instance exit status of docker [ {hostname} ] is : {msg_dict[status]}\n " + f" and git commit : {git_commit}"
try: send_msg(get_msg(text))
text = f"crash_gen instance exit status of docker [ {hostname} ] is : {msg_dict[status]}\n " + f" and git commit : {git_commit}" except Exception as e:
send_msg(get_msg(text)) print("exception:", e)
except Exception as e: exit(status)
print("exception:", e)
exit(status)
if __name__ == '__main__': if __name__ == '__main__':

16
tests/pytest/auto_crash_gen_valgrind_cluster.py
View File

@ -357,7 +357,7 @@ def main():
print( " crash_gen.sh is not exists ") print( " crash_gen.sh is not exists ")
sys.exit(1) sys.exit(1)
git_commit = subprocess.Popen("cd %s && git log | head -n1"%crash_gen_path, shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")[8:16] git_commit = subprocess.Popen("cd %s && git log | head -n1"%crash_gen_path, shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")[7:16]
# crash_cmds = get_cmds() # crash_cmds = get_cmds()
@ -383,14 +383,12 @@ def main():
else: else:
print('======== crash_gen run sucess and exit as expected ========') print('======== crash_gen run sucess and exit as expected ========')
if status!=0 : try:
text = f"crash_gen instance exit status of docker [ {hostname} ] is : {msg_dict[status]}\n " + f" and git commit : {git_commit}"
try: send_msg(get_msg(text))
text = f"crash_gen instance exit status of docker [ {hostname} ] is : {msg_dict[status]}\n " + f" and git commit : {git_commit}" except Exception as e:
send_msg(get_msg(text)) print("exception:", e)
except Exception as e: exit(status)
print("exception:", e)
exit(status)
if __name__ == '__main__': if __name__ == '__main__':