Merge branch 'develop' into feature/changshuaiqiang/testcase

* develop:
  scripts
  crash while print log
  change describe log.dn
  invalid read while sync

src/client/src/tscSubquery.c

@@ -1436,7 +1436,7 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
       return;
     } else {  // reach the maximum retry count, abort
       atomic_val_compare_exchange_32(&pState->code, TSDB_CODE_SUCCESS, numOfRows);
-      tscError("%p sub:%p retrieve failed,code:%s,orderOfSub:%d failed.no more retry,set global code:%d", pPObj, pSql,
+      tscError("%p sub:%p retrieve failed,code:%d,orderOfSub:%d failed.no more retry,set global code:%d", pPObj, pSql,
                numOfRows, subqueryIndex, tstrerror(pState->code));
     }
   }

src/mnode/src/mgmtMain.c

@@ -55,11 +55,6 @@ int32_t mgmtStartSystem() {
     return -1;
   }
 
-  if (grantInit() < 0) {
-    mError("failed to init grant");
-    return -1;
-  }
-
   if (mgmtInitUsers() < 0) {
     mError("failed to init users");
     return -1;
@@ -99,6 +94,11 @@ int32_t mgmtStartSystem() {
     mError("failed to init balance")
   }
 
+  if (grantInit() < 0) {
+    mError("failed to init grant");
+    return -1;
+  }
+
   if (mgmtInitServer() < 0) {
     return -1;
   }
@@ -132,19 +132,18 @@ int32_t mgmtInitSystem() {
 
 void mgmtCleanUpSystem() {
   mPrint("starting to clean up mgmt");
-  grantCleanUp();
-  mgmtCleanupMnodes();
-  balanceCleanUp();
   mgmtCleanUpShell();
   mgmtCleanupServer();
-  mgmtCleanUpAccts();
+  grantCleanUp();
+  balanceCleanUp();
+  sdbCleanUp();
+  mgmtCleanupMnodes();
   mgmtCleanUpTables();
   mgmtCleanUpVgroups();
   mgmtCleanUpDbs();
   mgmtCleanupDnodes();
   mgmtCleanUpUsers();
-  sdbCleanUp();
-  taosTmrCleanUp(tsMgmtTmr);
+  mgmtCleanUpAccts();
   tsMgmtIsRunning = false;
   mPrint("mgmt is cleaned up");
 }

src/mnode/src/mgmtShell.c

@@ -66,21 +66,26 @@ int32_t mgmtInitShell() {
   
   tsMgmtTmr = taosTmrInit((tsMaxShellConns) * 3, 200, 3600000, "MND");
   tsMgmtTranQhandle = taosInitScheduler(tsMaxShellConns, 1, "mnodeT");
-  tsQhandleCache = taosCacheInit(tsMgmtTmr, 2);
+  tsQhandleCache = taosCacheInit(tsMgmtTmr, 10);
 
   return 0;
 }
 
 void mgmtCleanUpShell() {
-  if (tsMgmtTranQhandle) {
-    taosCleanUpScheduler(tsMgmtTranQhandle);
-    tsMgmtTranQhandle = NULL;
+  if (tsMgmtTmr != NULL){
+    taosTmrCleanUp(tsMgmtTmr);
+    tsMgmtTmr = NULL;
   }
 
-  if (tsQhandleCache) {
+  if (tsQhandleCache != NULL) {
     taosCacheCleanup(tsQhandleCache);
     tsQhandleCache = NULL;
   }
+  
+  if (tsMgmtTranQhandle != NULL) {
+    taosCleanUpScheduler(tsMgmtTranQhandle);
+    tsMgmtTranQhandle = NULL;
+  }
 }
 
 void mgmtAddShellMsgHandle(uint8_t showType, void (*fp)(SQueuedMsg *queuedMsg)) {

tests/examples/JDBC/springbootdemo/readme.md

@@ -14,7 +14,7 @@ spring.datasource.druid.max-active=5
 # max wait time for get connection, ms
 spring.datasource.druid.max-wait=60000
 
-spring.datasource.druid.validation-query=describe log.dn
+spring.datasource.druid.validation-query=select server_status();
 spring.datasource.druid.validation-query-timeout=5000
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-return=false

tests/examples/JDBC/springbootdemo/src/main/resources/application.properties

@@ -10,7 +10,7 @@ spring.datasource.druid.max-active=5
 # max wait time for get connection, ms
 spring.datasource.druid.max-wait=60000
 
-spring.datasource.druid.validation-query=describe log.dn
+spring.datasource.druid.validation-query=select server_status();
 spring.datasource.druid.validation-query-timeout=5000
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-return=false
@@ -23,4 +23,4 @@ spring.datasource.druid.max-evictable-idle-time-millis=900000
 #mybatis
 mybatis.mapper-locations=classpath:mapper/*.xml
 
-logging.level.com.taosdata.jdbc.springbootdemo.dao=debug
+logging.level.com.taosdata.jdbc.springbootdemo.dao=debug

tests/script/unique/db/replica_add12.sim

@@ -73,9 +73,9 @@ endi
 sleep 2000
 
 sql show dnodes
-print dnode1 ==> openVnodes: $data3_1
-print dnode2 ==> openVnodes: $data3_2
-print dnode3 ==> openVnodes: $data3_3
+print dnode1 ==> openVnodes: $data2_1
+print dnode2 ==> openVnodes: $data2_2
+print dnode3 ==> openVnodes: $data2_3
 
 if $data2_1 != 0 then
    return -1
@@ -99,9 +99,9 @@ sleep 10000
 print ======== step3
 	
 sql show dnodes
-print dnode1 ==> openVnodes: $data3_1
-print dnode2 ==> openVnodes: $data3_2
-print dnode3 ==> openVnodes: $data3_3
+print dnode1 ==> openVnodes: $data2_1
+print dnode2 ==> openVnodes: $data2_2
+print dnode3 ==> openVnodes: $data2_3
 
 if $data2_1 != 0 then
    return -1

tests/script/unique/mnode/mgmt22.sim

@@ -8,7 +8,8 @@ system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
 
 print ============== step1
-system sh/exec_up.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start -t
+sleep 3000
 sql connect
 
 sql show mnodes
@@ -19,7 +20,7 @@ if $data2_1 != master then
 endi
 
 print ============== step2
-system sh/exec_up.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start -t
 sql create dnode $hostname2
 
 $x = 0
@@ -44,8 +45,12 @@ print ============== step3
 sql_error drop dnode $hostname1 -x error1
 print should not drop master
 
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+return
+
 print ============== step4
-system sh/exec_up.sh -n dnode1 -s stop
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 sql_error show mnodes
 print error of no master
 
@@ -78,7 +83,7 @@ if $data2_2 != slave then
 endi
 
 print ============== step7
-system sh/exec_up.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start -t
 sql create dnode $hostname3
 sleep 5000