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

Merge pull request #714 from taosdata/feature/slguan 

[TBASE-1116]
This commit is contained in:
plum-lihui 2019-11-13 19:11:51 +08:00 committed by GitHub
parent adbf4c22c1 32c5c18c3f
commit 1aec55be65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ int httpStartSystem() {
if (httpServer == NULL) { if (httpServer == NULL) {
httpError("http server is null"); httpError("http server is null");
return -1; httpInitSystem();
} }
if (httpServer->pContextPool == NULL) { if (httpServer->pContextPool == NULL) {

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

@ -95,6 +95,9 @@ int monitorInitSystem() {
} }
int monitorStartSystem() { int monitorStartSystem() {
if (monitor == NULL) {
monitorInitSystem();
}
taosTmrReset(monitorInitConn, 10, NULL, tscTmr, &monitor->initTimer); taosTmrReset(monitorInitConn, 10, NULL, tscTmr, &monitor->initTimer);
return 0; return 0;
} }

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

@ -33,8 +33,8 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverflow" #pragma GCC diagnostic ignored "-Woverflow"
SModule tsModule[TSDB_MOD_MAX]; SModule tsModule[TSDB_MOD_MAX] = {0};
uint32_t tsModuleStatus; uint32_t tsModuleStatus = 0;
pthread_mutex_t dmutex; pthread_mutex_t dmutex;
extern int vnodeSelectReqNum; extern int vnodeSelectReqNum;
extern int vnodeInsertReqNum; extern int vnodeInsertReqNum;