提交 2114f729 编写于 作者: S Steven Li

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

...@@ -86,8 +86,11 @@ void tscSetMgmtIpListFromEdge() { ...@@ -86,8 +86,11 @@ void tscSetMgmtIpListFromEdge() {
} }
void tscUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) { void tscUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) {
tscTrace("mgmt IP list is changed for ufp is called");
tscMgmtIpSet = *pIpSet; 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) { void tscSetMgmtIpList(SRpcIpSet *pIpList) {
...@@ -138,7 +141,7 @@ void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) { ...@@ -138,7 +141,7 @@ void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) {
if (pRsp->streamId) tscKillStream(pObj, htonl(pRsp->streamId)); if (pRsp->streamId) tscKillStream(pObj, htonl(pRsp->streamId));
} }
} else { } else {
tscTrace("heart beat failed, code:%d", code); tscTrace("heart beat failed, code:%s", tstrerror(code));
} }
taosTmrReset(tscProcessActivityTimer, tsShellActivityTimer * 500, pObj, tscTmr, &pObj->pTimer); taosTmrReset(tscProcessActivityTimer, tsShellActivityTimer * 500, pObj, tscTmr, &pObj->pTimer);
......
...@@ -43,6 +43,8 @@ extern int32_t tscEmbedded; ...@@ -43,6 +43,8 @@ extern int32_t tscEmbedded;
} }
#define uPrint(...) \ #define uPrint(...) \
{ taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
#define uForcePrint(...) \
{ taosPrintLog("ERROR UTL ", 255, __VA_ARGS__); }
#define pError(...) \ #define pError(...) \
{ taosPrintLog("ERROR APP ", 255, __VA_ARGS__); } { taosPrintLog("ERROR APP ", 255, __VA_ARGS__); }
......
...@@ -27,27 +27,20 @@ ...@@ -27,27 +27,20 @@
* In case that the setLocale failed to be executed, the right charset needs to be set. * In case that the setLocale failed to be executed, the right charset needs to be set.
*/ */
void tsSetLocale() { 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); char *locale = setlocale(LC_CTYPE, tsLocale);
// default locale or user specified locale is not valid, abort launch // default locale or user specified locale is not valid, abort launch
if (locale == NULL) { 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) { 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); exit(-1);
} }
if (!taosValidateEncodec(tsCharset)) { if (!taosValidateEncodec(tsCharset)) {
printf(msgCharset, tsCharset); uForcePrint("Invalid charset:%s, please set the valid charset in config file", tsCharset);
uPrint(msgCharset, tsCharset);
exit(-1); exit(-1);
} }
} }
\ No newline at end of file
...@@ -225,10 +225,11 @@ static void taosGetSystemLocale() { // get and set default locale ...@@ -225,10 +225,11 @@ static void taosGetSystemLocale() { // get and set default locale
if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) { if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
locale = setlocale(LC_CTYPE, ""); locale = setlocale(LC_CTYPE, "");
if (locale == NULL) { 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 { } else {
strncpy(tsLocale, locale, tListLen(tsLocale)); 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 ...@@ -243,7 +244,10 @@ static void taosGetSystemLocale() { // get and set default locale
strncpy(tsCharset, revisedCharset, tListLen(tsCharset)); strncpy(tsCharset, revisedCharset, tListLen(tsCharset));
free(revisedCharset); 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");
} }
} }
} }
......
...@@ -508,7 +508,7 @@ void httpAcceptHttpConnection(void *arg) { ...@@ -508,7 +508,7 @@ void httpAcceptHttpConnection(void *arg) {
pServer->serverPort); pServer->serverPort);
return; return;
} else { } 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; pServer->online = true;
} }
......
...@@ -643,10 +643,11 @@ static SRpcConn *rpcGetConnObj(SRpcInfo *pRpc, int sid, SRecvInfo *pRecv) { ...@@ -643,10 +643,11 @@ static SRpcConn *rpcGetConnObj(SRpcInfo *pRpc, int sid, SRecvInfo *pRecv) {
if (sid) { if (sid) {
pConn = pRpc->connList + 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) {
if (pConn->linkUid != pHead->linkUid) { if (pConn->linkUid != pHead->linkUid) {
tTrace("%s %p, linkUid:0x%x not matched, received:0x%x", pRpc->label, pConn, pConn->linkUid, pHead->linkUid); tTrace("%s %p, linkUid:0x%x not matched, received:0x%x", pRpc->label, pConn, pConn->linkUid, pHead->linkUid);
......
...@@ -55,6 +55,7 @@ print error of no master ...@@ -55,6 +55,7 @@ print error of no master
print ============== step6 print ============== step6
system sh/exec_up.sh -n dnode1 -s start system sh/exec_up.sh -n dnode1 -s start
sleep 2000
sql close sql close
sql connect sql connect
...@@ -66,7 +67,7 @@ show6: ...@@ -66,7 +67,7 @@ show6:
return -1 return -1
endi endi
sql show mnodes sql show mnodes -x show6
print dnode1 ==> $data2_1 print dnode1 ==> $data2_1
print dnode2 ==> $data2_2 print dnode2 ==> $data2_2
if $data2_1 != master then if $data2_1 != master then
......
...@@ -414,6 +414,7 @@ void simCloseNativeConnect(SScript *script) { ...@@ -414,6 +414,7 @@ void simCloseNativeConnect(SScript *script) {
simTrace("script:%s, taos:%p closed", script->fileName, script->taos); simTrace("script:%s, taos:%p closed", script->fileName, script->taos);
taos_close(script->taos); taos_close(script->taos);
taosMsleep(1000);
script->taos = NULL; script->taos = NULL;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册