diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index 9b44bea82d1c9927b9ef2cf1331af5bf7267d7f9..9488d4a79e60b8a9468091a2df79736220ebcb13 100644 --- a/src/client/src/tscServer.c +++ b/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); diff --git a/src/common/inc/tulog.h b/src/common/inc/tulog.h index b5499d81fca796b94071706988053d9811d84d84..143bc56f9ff5a8042fc29fe4497807d815002760 100644 --- a/src/common/inc/tulog.h +++ b/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__); } diff --git a/src/common/src/tlocale.c b/src/common/src/tlocale.c index 35a68218f1299e3e71767187cdb155d1d93b0eec..b2631cf08c4699c8ad7a79d80f30a4c81cedb30e 100644 --- a/src/common/src/tlocale.c +++ b/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); - uPrint(msgLocale, tsLocale); + uForcePrint("Invalid locale:%s, please set the valid locale in config file", tsLocale); } if (strlen(tsCharset) == 0) { - printf("%s\n", msgCharset1); - uPrint(msgCharset1); + uForcePrint("failed to get charset, please set the valid charset in config file"); exit(-1); } if (!taosValidateEncodec(tsCharset)) { - printf(msgCharset, tsCharset); - uPrint(msgCharset, tsCharset); + uForcePrint("Invalid charset:%s, please set the valid charset in config file", tsCharset); exit(-1); } } \ No newline at end of file diff --git a/src/os/linux/src/linuxSysPara.c b/src/os/linux/src/linuxSysPara.c index 98d80ded5d2af81be0fcede60129230c04f2435e..f43ed44a4bab19a8db80bc89fbb5074531edc514 100644 --- a/src/os/linux/src/linuxSysPara.c +++ b/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"); } } } diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c index f36e0440cb07c20db8894cd400fe4b60041f6452..9b8affcde256065ef97709976afa7b4f5dc8ada5 100644 --- a/src/plugins/http/src/httpServer.c +++ b/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; } diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c index f616cd00b7f43430431ee88d14e7356ae9b99077..dfb549b3f9c914fefa396a6cefcd974bc11eff97 100644 --- a/src/rpc/src/rpcMain.c +++ b/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 { - pConn = rpcAllocateServerConn(pRpc, pRecv); + if (pConn->user[0] == 0) pConn = NULL; } + 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); diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim index 5e2b5623e353683bdf77e28495e17514f508da40..9fda0f108967eaeda99e96b7739c7f1201f354cb 100644 --- a/tests/script/unique/mnode/mgmt22.sim +++ b/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 diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c index b407289c3ad816c16075c6f8a98cd8ee559a5027..26291ba992346b595314d3e017272809aad3d62e 100644 --- a/tests/tsim/src/simExe.c +++ b/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; }