Merge remote-tracking branch 'origin/develop' into feature/python-test-no-sudo

src/client/src/tscServer.c

@@ -86,8 +86,11 @@ void tscSetMgmtIpListFromEdge() {
 }
 
 void tscUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) {
-  tscTrace("mgmt IP list is changed for ufp is called");
   tscMgmtIpSet = *pIpSet;
+  tscTrace("mgmt IP list is changed for ufp is called, numOfIps:%d inUse:%d", tscMgmtIpSet.numOfIps, tscMgmtIpSet.inUse);
+  for (int32_t i = 0; i < tscMgmtIpSet.numOfIps; ++i) {
+    tscTrace("index:%d fqdn:%s port:%d", i, tscMgmtIpSet.fqdn[i], tscMgmtIpSet.port[i]);
+  }
 }
 
 void tscSetMgmtIpList(SRpcIpSet *pIpList) {
@@ -138,7 +141,7 @@ void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) {
       if (pRsp->streamId) tscKillStream(pObj, htonl(pRsp->streamId));
     }
   } else {
-    tscTrace("heart beat failed, code:%d", code);
+    tscTrace("heart beat failed, code:%s", tstrerror(code));
   }
 
   taosTmrReset(tscProcessActivityTimer, tsShellActivityTimer * 500, pObj, tscTmr, &pObj->pTimer);

src/common/inc/tulog.h

@@ -43,6 +43,8 @@ extern int32_t tscEmbedded;
   }
 #define uPrint(...) \
   { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
+#define uForcePrint(...) \
+  { taosPrintLog("ERROR UTL ", 255, __VA_ARGS__); }
 
 #define pError(...) \
   { taosPrintLog("ERROR APP ", 255, __VA_ARGS__); }  

src/common/src/tlocale.c

@@ -27,27 +27,20 @@
  * In case that the setLocale failed to be executed, the right charset needs to be set.
  */
 void tsSetLocale() {
-  char msgLocale[] = "Invalid locale:%s, please set the valid locale in config file\n";
-  char msgCharset[] = "Invalid charset:%s, please set the valid charset in config file\n";
-  char msgCharset1[] = "failed to get charset, please set the valid charset in config file\n";
-
   char *locale = setlocale(LC_CTYPE, tsLocale);
 
   // default locale or user specified locale is not valid, abort launch
   if (locale == NULL) {
-    printf(msgLocale, tsLocale);
+    uForcePrint("Invalid locale:%s, please set the valid locale in config file", tsLocale);
-    uPrint(msgLocale, tsLocale);
   }
 
   if (strlen(tsCharset) == 0) {
-    printf("%s\n", msgCharset1);
+    uForcePrint("failed to get charset, please set the valid charset in config file");
-    uPrint(msgCharset1);
     exit(-1);
   }
 
   if (!taosValidateEncodec(tsCharset)) {
-    printf(msgCharset, tsCharset);
+    uForcePrint("Invalid charset:%s, please set the valid charset in config file", tsCharset);
-    uPrint(msgCharset, tsCharset);
     exit(-1);
   }
 }

src/os/linux/src/linuxSysPara.c

@@ -225,10 +225,11 @@ static void taosGetSystemLocale() {  // get and set default locale
   if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
     locale = setlocale(LC_CTYPE, "");
     if (locale == NULL) {
-      uError("can't get locale from system");
+      uForcePrint("can't get locale from system, set it to en_US.UTF-8");
+      strcpy(tsLocale, "en_US.UTF-8");
     } else {
       strncpy(tsLocale, locale, tListLen(tsLocale));
-      uPrint("locale not configured, set to system default:%s", tsLocale);
+      uForcePrint("locale not configured, set to system default:%s", tsLocale);
     }
   }
 
@@ -243,7 +244,10 @@ static void taosGetSystemLocale() {  // get and set default locale
       strncpy(tsCharset, revisedCharset, tListLen(tsCharset));
 
       free(revisedCharset);
-      uPrint("charset not configured, set to system default:%s", tsCharset);
+      uForcePrint("charset not configured, set to system default:%s", tsCharset);
+    } else {
+      strcpy(tsCharset, "UTF-8");
+      uForcePrint("can't get locale and charset from system, set it to UTF-8");
     }
   }
 }

src/plugins/http/src/httpServer.c

@@ -508,7 +508,7 @@ void httpAcceptHttpConnection(void *arg) {
               pServer->serverPort);
     return;
   } else {
-    httpPrint("http service init success at ip:%s:%u", pServer->serverIp, pServer->serverPort);
+    httpPrint("http service init success at %u", pServer->serverPort);
     pServer->online = true;
   }
 

src/rpc/src/rpcMain.c

@@ -643,10 +643,11 @@ static SRpcConn *rpcGetConnObj(SRpcInfo *pRpc, int sid, SRecvInfo *pRecv) {
 
   if (sid) {
     pConn = pRpc->connList + sid;
-  } else {
+    if (pConn->user[0] == 0) pConn = NULL;
-    pConn = rpcAllocateServerConn(pRpc, pRecv);
   } 
 
+  if (pConn == NULL) pConn = rpcAllocateServerConn(pRpc, pRecv);
+
   if (pConn) {
     if (pConn->linkUid != pHead->linkUid) {
       tTrace("%s %p, linkUid:0x%x not matched, received:0x%x", pRpc->label, pConn, pConn->linkUid, pHead->linkUid);

tests/script/unique/mnode/mgmt22.sim

@@ -55,6 +55,7 @@ print error of no master
 
 print ============== step6
 system sh/exec_up.sh -n dnode1 -s start
+sleep 2000
 sql close
 sql connect
 
@@ -66,7 +67,7 @@ show6:
 		return -1
 	endi
 	
-sql show mnodes
+sql show mnodes -x show6
 print dnode1 ==> $data2_1
 print dnode2 ==> $data2_2
 if $data2_1 != master then

tests/tsim/src/simExe.c

@@ -414,6 +414,7 @@ void simCloseNativeConnect(SScript *script) {
 
   simTrace("script:%s, taos:%p closed", script->fileName, script->taos);
   taos_close(script->taos);
+  taosMsleep(1000);
 
   script->taos = NULL;
 }