diff --git a/src/modules/http/src/httpServer.c b/src/modules/http/src/httpServer.c index 333b770a5f87809e8fa278bd0d25a7e3d44ca026..01d3ef40f2d5a82821842e0b27c2e648d52bf237 100644 --- a/src/modules/http/src/httpServer.c +++ b/src/modules/http/src/httpServer.c @@ -527,8 +527,8 @@ void httpAcceptHttpConnection(void *arg) { totalFds += pServer->pThreads[i].numOfFds; } - if (totalFds > tsHttpCacheSessions * 20) { - httpError("fd:%d, ip:%s:%u, totalFds:%d larger than httpCacheSessions:%d*20, refuse connection", + if (totalFds > tsHttpCacheSessions * 100) { + httpError("fd:%d, ip:%s:%u, totalFds:%d larger than httpCacheSessions:%d*100, refuse connection", connFd, inet_ntoa(clientAddr.sin_addr), htons(clientAddr.sin_port), totalFds, tsHttpCacheSessions); taosCloseSocket(connFd); continue; diff --git a/src/modules/http/src/httpSystem.c b/src/modules/http/src/httpSystem.c index 93d2b1d2cd12b0b20c94886c6652698e865dc784..25ab55aed9bc6d166f0b423f32a8c1f241487202 100644 --- a/src/modules/http/src/httpSystem.c +++ b/src/modules/http/src/httpSystem.c @@ -89,7 +89,7 @@ int httpStartSystem() { } if (httpServer->timerHandle == NULL) { - httpServer->timerHandle = taosTmrInit(tsHttpCacheSessions * 20 + 100, 200, 60000, "http"); + httpServer->timerHandle = taosTmrInit(tsHttpCacheSessions * 100 + 100, 200, 60000, "http"); } if (httpServer->timerHandle == NULL) { httpError("http init timer failed"); diff --git a/src/modules/monitor/src/monitorSystem.c b/src/modules/monitor/src/monitorSystem.c index 4d6577c8f3718ad9ecd576a55a19049ad0513c1b..4a8d17cda66555593d244960cb2217b1b7904965 100644 --- a/src/modules/monitor/src/monitorSystem.c +++ b/src/modules/monitor/src/monitorSystem.c @@ -246,9 +246,9 @@ void monitorStopSystem() { } #ifdef CLUSTER - monitorLPrint("dnode:%s is stopped", tsPrivateIp); + monitorLPrint("dnode:%s monitor module is stopped", tsPrivateIp); #else - monitorLPrint("dnode:%s is stopped", tsInternalIp); + monitorLPrint("dnode:%s monitor module is stopped", tsInternalIp); #endif monitor->state = MONITOR_STATE_STOPPED; taosLogFp = NULL; diff --git a/src/rpc/src/tudp.c b/src/rpc/src/tudp.c index 7a4961f90c2b7d71991ece4d4d64afac32e33fd6..58a893f0741e571abbc29582cd3bd15c402703fe 100644 --- a/src/rpc/src/tudp.c +++ b/src/rpc/src/tudp.c @@ -506,6 +506,8 @@ void *taosInitUdpConnection(char *ip, short port, char *label, int threads, void pConn->localPort = (int16_t)ntohs(sin.sin_port); } + strcpy(pConn->label, label); + if (pthread_create(&pConn->thread, &thAttr, taosRecvUdpData, pConn) != 0) { tError("%s failed to create thread to process UDP data, reason:%s", label, strerror(errno)); taosCloseSocket(pConn->fd); @@ -513,7 +515,6 @@ void *taosInitUdpConnection(char *ip, short port, char *label, int threads, void return NULL; } - strcpy(pConn->label, label); pConn->shandle = shandle; pConn->processData = fp; pConn->index = i; diff --git a/src/system/detail/src/dnodeSystem.c b/src/system/detail/src/dnodeSystem.c index 8815a8f42dd494a508161744a583d711a11e7e6e..05a7bef48688cb765c871c06f23629589cb4ef6a 100644 --- a/src/system/detail/src/dnodeSystem.c +++ b/src/system/detail/src/dnodeSystem.c @@ -136,6 +136,8 @@ int dnodeInitSystem() { return -1; } + vnodeInitMgmtIp(); + tsPrintGlobalConfig(); dPrint("Server IP address is:%s", tsInternalIp); diff --git a/src/system/detail/src/vnodeCommit.c b/src/system/detail/src/vnodeCommit.c index 73c891f7bbc36df2b101889e12c739abf815a76b..70c4cfe280c619431193dcd91bf33b1a0a917f6c 100644 --- a/src/system/detail/src/vnodeCommit.c +++ b/src/system/detail/src/vnodeCommit.c @@ -235,7 +235,7 @@ int vnodeInitCommit(int vnode) { } pVnode->pWrite += size; - dTrace("vid:%d, commit log is initialized", vnode); + dPrint("vid:%d, commit log is initialized", vnode); return 0; } diff --git a/src/system/detail/src/vnodeShell.c b/src/system/detail/src/vnodeShell.c index 9000a7df78fe1b34b982a2e39a4d32ea3f0d85e0..d39fda80423dbd2ac8283450ea8e4ad3ab1fc8c6 100644 --- a/src/system/detail/src/vnodeShell.c +++ b/src/system/detail/src/vnodeShell.c @@ -178,7 +178,7 @@ int vnodeOpenShellVnode(int vnode) { return -1; } - dTrace("vid:%d, sessions:%d, shell is opened", vnode, pCfg->maxSessions); + dPrint("vid:%d, sessions:%d, shell is opened", vnode, pCfg->maxSessions); return TSDB_CODE_SUCCESS; } diff --git a/src/system/lite/src/dnodeMgmt.spec.c b/src/system/lite/src/dnodeMgmt.spec.c index 6c424a85af38022fd5acdc433b0442982d288471..e40b21ab8340aace1198d3e8b632b61f78602adb 100644 --- a/src/system/lite/src/dnodeMgmt.spec.c +++ b/src/system/lite/src/dnodeMgmt.spec.c @@ -90,4 +90,6 @@ void vnodeProcessMsgFromMgmtSpec(SSchedMsg *sched) { int vnodeInitMgmt() { return 0; } +void vnodeInitMgmtIp() {} + int vnodeSaveCreateMsgIntoQueue(SVnodeObj *pVnode, char *pMsg, int msgLen) { return 0; } \ No newline at end of file