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

cmake/cmake.version

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

cmake/taosadapter_CMakeLists.txt.in

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

source/libs/stream/src/streamMeta.c

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

source/libs/stream/src/streamState.c

@@ -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) {
-  szPage = szPage < 0 ? (16 * 1024) : szPage;
+  szPage = szPage < 0 ? 4096 : szPage;
   pages = pages < 0 ? 256 : pages;
   SStreamState* pState = taosMemoryCalloc(1, sizeof(SStreamState));
   if (pState == NULL) {

tests/pytest/auto_crash_gen.py

@@ -324,7 +324,7 @@ def main():
         print( " crash_gen.sh is not exists ")
         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()
     
@@ -348,15 +348,12 @@ def main():
     else:
         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}"
-            send_msg(get_msg(text))  
-        except Exception as e:
-            print("exception:", e)
-        exit(status)
+    try:
+        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))  
+    except Exception as e:
+        print("exception:", e)
+    exit(status)
         
 
 if __name__ == '__main__':

tests/pytest/auto_crash_gen_valgrind.py

@@ -357,7 +357,7 @@ def main():
         print( " crash_gen.sh is not exists ")
         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()
     
@@ -383,14 +383,12 @@ def main():
     else:
         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}"
-            send_msg(get_msg(text))  
-        except Exception as e:
-            print("exception:", e)
-        exit(status)
+    try:
+        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))  
+    except Exception as e:
+        print("exception:", e)
+    exit(status)
         
 
 if __name__ == '__main__':

tests/pytest/auto_crash_gen_valgrind_cluster.py

@@ -357,7 +357,7 @@ def main():
         print( " crash_gen.sh is not exists ")
         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()
     
@@ -383,14 +383,12 @@ def main():
     else:
         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}"
-            send_msg(get_msg(text))  
-        except Exception as e:
-            print("exception:", e)
-        exit(status)
+    try:
+        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))  
+    except Exception as e:
+        print("exception:", e)
+    exit(status)
         
 
 if __name__ == '__main__':