xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TBASE-1128]

This commit is contained in:
slguan 2019-11-22 14:18:41 +08:00
parent 7725aa1c9a
commit 026d0b499b
8 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/http/src/httpServer.c
View File

@ -527,8 +527,8 @@ void httpAcceptHttpConnection(void *arg) {
totalFds += pServer->pThreads[i].numOfFds; totalFds += pServer->pThreads[i].numOfFds;
} }
if (totalFds > tsHttpCacheSessions * 20) { if (totalFds > tsHttpCacheSessions * 100) {
httpError("fd:%d, ip:%s:%u, totalFds:%d larger than httpCacheSessions:%d*20, refuse connection", 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); connFd, inet_ntoa(clientAddr.sin_addr), htons(clientAddr.sin_port), totalFds, tsHttpCacheSessions);
taosCloseSocket(connFd); taosCloseSocket(connFd);
continue; continue;

2
src/modules/http/src/httpSystem.c
View File

@ -89,7 +89,7 @@ int httpStartSystem() {
} }
if (httpServer->timerHandle == NULL) { 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) { if (httpServer->timerHandle == NULL) {
httpError("http init timer failed"); httpError("http init timer failed");

4
src/modules/monitor/src/monitorSystem.c
View File

@ -246,9 +246,9 @@ void monitorStopSystem() {
} }
#ifdef CLUSTER #ifdef CLUSTER
monitorLPrint("dnode:%s is stopped", tsPrivateIp); monitorLPrint("dnode:%s monitor module is stopped", tsPrivateIp);
#else #else
monitorLPrint("dnode:%s is stopped", tsInternalIp); monitorLPrint("dnode:%s monitor module is stopped", tsInternalIp);
#endif #endif
monitor->state = MONITOR_STATE_STOPPED; monitor->state = MONITOR_STATE_STOPPED;
taosLogFp = NULL; taosLogFp = NULL;

3
src/rpc/src/tudp.c
View File

@ -506,6 +506,8 @@ void *taosInitUdpConnection(char *ip, short port, char *label, int threads, void
pConn->localPort = (int16_t)ntohs(sin.sin_port); pConn->localPort = (int16_t)ntohs(sin.sin_port);
} }
strcpy(pConn->label, label);
if (pthread_create(&pConn->thread, &thAttr, taosRecvUdpData, pConn) != 0) { if (pthread_create(&pConn->thread, &thAttr, taosRecvUdpData, pConn) != 0) {
tError("%s failed to create thread to process UDP data, reason:%s", label, strerror(errno)); tError("%s failed to create thread to process UDP data, reason:%s", label, strerror(errno));
taosCloseSocket(pConn->fd); taosCloseSocket(pConn->fd);
@ -513,7 +515,6 @@ void *taosInitUdpConnection(char *ip, short port, char *label, int threads, void
return NULL; return NULL;
} }
strcpy(pConn->label, label);
pConn->shandle = shandle; pConn->shandle = shandle;
pConn->processData = fp; pConn->processData = fp;
pConn->index = i; pConn->index = i;

2
src/system/detail/src/dnodeSystem.c
View File

@ -136,6 +136,8 @@ int dnodeInitSystem() {
return -1; return -1;
} }
vnodeInitMgmtIp();
tsPrintGlobalConfig(); tsPrintGlobalConfig();
dPrint("Server IP address is:%s", tsInternalIp); dPrint("Server IP address is:%s", tsInternalIp);

2
src/system/detail/src/vnodeCommit.c
View File

@ -235,7 +235,7 @@ int vnodeInitCommit(int vnode) {
} }
pVnode->pWrite += size; pVnode->pWrite += size;
dTrace("vid:%d, commit log is initialized", vnode); dPrint("vid:%d, commit log is initialized", vnode);
return 0; return 0;
} }

2
src/system/detail/src/vnodeShell.c
View File

@ -178,7 +178,7 @@ int vnodeOpenShellVnode(int vnode) {
return -1; 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; return TSDB_CODE_SUCCESS;
} }

2
src/system/lite/src/dnodeMgmt.spec.c
View File

@ -90,4 +90,6 @@ void vnodeProcessMsgFromMgmtSpec(SSchedMsg *sched) {
int vnodeInitMgmt() { return 0; } int vnodeInitMgmt() { return 0; }
void vnodeInitMgmtIp() {}
int vnodeSaveCreateMsgIntoQueue(SVnodeObj *pVnode, char *pMsg, int msgLen) { return 0; } int vnodeSaveCreateMsgIntoQueue(SVnodeObj *pVnode, char *pMsg, int msgLen) { return 0; }