diff --git a/src/dnode/src/dnodeMClient.c b/src/dnode/src/dnodeMClient.c index d791ad0f01ca6469fc97cd98e239c7011dc759d4..85454af095aed7782c4fbbd3f2f3be0bf3210024 100644 --- a/src/dnode/src/dnodeMClient.c +++ b/src/dnode/src/dnodeMClient.c @@ -59,7 +59,7 @@ int32_t dnodeInitMClient() { dError("failed to init dnode timer"); return -1; } - + if (!dnodeReadMnodeIpList()) { memset(&tsMnodeIpList, 0, sizeof(SRpcIpSet)); memset(&tsMnodeInfos, 0, sizeof(SDMNodeInfos)); diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c index 64d1ad4048ebb287c1211536a5a6e77a1429a038..5fba941788965f1d60fc47fb4e7abc7eef09df5a 100644 --- a/src/dnode/src/dnodeMain.c +++ b/src/dnode/src/dnodeMain.c @@ -177,7 +177,6 @@ static int32_t dnodeInitSystem() { static void dnodeCleanUpSystem() { if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_STOPPED) { - tclearModuleStatus(TSDB_MOD_MGMT); dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_STOPPED); dnodeCleanupShell(); dnodeCleanupMnode(); diff --git a/src/mnode/src/mgmtSdb.c b/src/mnode/src/mgmtSdb.c index 6bc3c20d18e8bd1f1ebcb61aba9ca881ca284bfe..70e2be5f4c8b643bc199a056796f56d126134ac0 100644 --- a/src/mnode/src/mgmtSdb.c +++ b/src/mnode/src/mgmtSdb.c @@ -504,6 +504,7 @@ void *sdbFetchRow(void *handle, void *pNode, void **ppRow) { void *sdbOpenTable(SSdbTableDesc *pDesc) { SSdbTable *pTable = (SSdbTable *)calloc(1, sizeof(SSdbTable)); + if (pTable == NULL) return NULL; strcpy(pTable->tableName, pDesc->tableName); @@ -557,7 +558,7 @@ void sdbCloseTable(void *handle) { } pthread_mutex_destroy(&pTable->mutex); - + sdbTrace("table:%s, is closed, numOfTables:%d", pTable->tableName, tsSdbNumOfTables); free(pTable); } diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c index 171f811b7d4f07d6ad2a5836669e9c3782ec0e41..5c321beffb0ad6e07d4f6cd4438c62f395cba6ef 100644 --- a/src/plugins/http/src/httpServer.c +++ b/src/plugins/http/src/httpServer.c @@ -270,7 +270,7 @@ void httpCleanUpConnect(HttpServer *pServer) { for (i = 0; i < pServer->numOfThreads; ++i) { pThread = pServer->pThreads + i; - taosCloseSocket(pThread->pollFd); + //taosCloseSocket(pThread->pollFd); while (pThread->pHead) { httpCleanUpContext(pThread->pHead, 0); @@ -591,7 +591,6 @@ void httpAcceptHttpConnection(void *arg) { bool httpInitConnect(HttpServer *pServer) { int i; - pthread_attr_t thattr; HttpThread * pThread; pServer->pThreads = (HttpThread *)malloc(sizeof(HttpThread) * (size_t)pServer->numOfThreads); @@ -601,8 +600,6 @@ bool httpInitConnect(HttpServer *pServer) { } memset(pServer->pThreads, 0, sizeof(HttpThread) * (size_t)pServer->numOfThreads); - pthread_attr_init(&thattr); - pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE); pThread = pServer->pThreads; for (i = 0; i < pServer->numOfThreads; ++i) { sprintf(pThread->label, "%s%d", pServer->label, i); @@ -626,21 +623,27 @@ bool httpInitConnect(HttpServer *pServer) { return false; } + pthread_attr_t thattr; + pthread_attr_init(&thattr); + pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE); if (pthread_create(&(pThread->thread), &thattr, (void *)httpProcessHttpData, (void *)(pThread)) != 0) { httpError("http thread:%s, failed to create HTTP process data thread, reason:%s", pThread->label, strerror(errno)); return false; } + pthread_attr_destroy(&thattr); httpTrace("http thread:%p:%s, initialized", pThread, pThread->label); pThread++; } + pthread_attr_t thattr; + pthread_attr_init(&thattr); + pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE); if (pthread_create(&(pServer->thread), &thattr, (void *)httpAcceptHttpConnection, (void *)(pServer)) != 0) { httpError("http server:%s, failed to create Http accept thread, reason:%s", pServer->label, strerror(errno)); return false; } - pthread_attr_destroy(&thattr); httpTrace("http server:%s, initialized, ip:%s:%u, numOfThreads:%d", pServer->label, pServer->serverIp, diff --git a/src/plugins/http/src/httpSystem.c b/src/plugins/http/src/httpSystem.c index deb0d877c77ed385bceaa94999f5e82277cc9cda..2a118cc2b14d01a8600d85970318bbcd3676131e 100644 --- a/src/plugins/http/src/httpSystem.c +++ b/src/plugins/http/src/httpSystem.c @@ -54,7 +54,7 @@ static HttpServer *httpServer = NULL; void taosInitNote(int numOfNoteLines, int maxNotes, char* lable); int httpInitSystem() { - taos_init(); + // taos_init(); httpServer = (HttpServer *)malloc(sizeof(HttpServer)); memset(httpServer, 0, sizeof(HttpServer)); @@ -129,7 +129,7 @@ void httpCleanUpSystem() { httpPrint("http service cleanup"); httpStopSystem(); -#if 0 +#if 1 if (httpServer == NULL) { return; }