From 61635dc03879aaa8fdd53a412e6a986cb06beb2a Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 30 Jul 2020 09:09:15 +0000 Subject: [PATCH] context log --- src/plugins/http/src/httpContext.c | 9 +++++---- src/plugins/http/src/httpServer.c | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/http/src/httpContext.c b/src/plugins/http/src/httpContext.c index 527e56ea0e..8c4cd743c8 100644 --- a/src/plugins/http/src/httpContext.c +++ b/src/plugins/http/src/httpContext.c @@ -52,13 +52,14 @@ static void httpDestroyContext(void *data) { // avoid double free httpFreeJsonBuf(pContext); httpFreeMultiCmds(pContext); - - httpDebug("context:%p, is destroyed, refCount:%d data:%p", pContext, pContext->refCount, data); + + httpDebug("context:%p, is destroyed, refCount:%d data:%p thread:%s numOfContexts:%d", pContext, pContext->refCount, + data, pContext->pThread->label, pContext->pThread->numOfContexts); tfree(pContext); } bool httpInitContexts() { - tsHttpServer.contextCache = taosCacheInit(TSDB_DATA_TYPE_BIGINT, 3, true, httpDestroyContext, "restc"); + tsHttpServer.contextCache = taosCacheInit(TSDB_DATA_TYPE_BIGINT, 2, true, httpDestroyContext, "restc"); if (tsHttpServer.contextCache == NULL) { httpError("failed to init context cache"); return false; @@ -108,7 +109,7 @@ HttpContext *httpCreateContext(int32_t fd) { pContext->lastAccessTime = taosGetTimestampSec(); pContext->state = HTTP_CONTEXT_STATE_READY; - HttpContext **ppContext = taosCachePut(tsHttpServer.contextCache, &pContext, sizeof(int64_t), &pContext, sizeof(int64_t), 5); + HttpContext **ppContext = taosCachePut(tsHttpServer.contextCache, &pContext, sizeof(int64_t), &pContext, sizeof(int64_t), 3); pContext->ppContext = ppContext; httpDebug("context:%p, fd:%d, is created, data:%p", pContext, fd, ppContext); diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c index 177d447f10..6806a3524c 100644 --- a/src/plugins/http/src/httpServer.c +++ b/src/plugins/http/src/httpServer.c @@ -299,12 +299,14 @@ static void *httpAcceptHttpConnection(void *arg) { totalFds += pServer->pThreads[i].numOfContexts; } +#if 0 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; } +#endif taosKeepTcpAlive(connFd); taosSetNonblocking(connFd, 1); -- GitLab