From 32c5c18c3fc68e5c8056234615c5bad47658709f Mon Sep 17 00:00:00 2001 From: slguan Date: Wed, 13 Nov 2019 19:08:00 +0800 Subject: [PATCH] [TBASE-1116] --- src/modules/http/src/httpSystem.c | 2 +- src/modules/monitor/src/monitorSystem.c | 3 +++ src/system/detail/src/dnodeSystem.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/http/src/httpSystem.c b/src/modules/http/src/httpSystem.c index 67be206842..df49251f13 100644 --- a/src/modules/http/src/httpSystem.c +++ b/src/modules/http/src/httpSystem.c @@ -77,7 +77,7 @@ int httpStartSystem() { if (httpServer == NULL) { httpError("http server is null"); - return -1; + httpInitSystem(); } if (httpServer->pContextPool == NULL) { diff --git a/src/modules/monitor/src/monitorSystem.c b/src/modules/monitor/src/monitorSystem.c index 78cee40f96..4d6577c8f3 100644 --- a/src/modules/monitor/src/monitorSystem.c +++ b/src/modules/monitor/src/monitorSystem.c @@ -95,6 +95,9 @@ int monitorInitSystem() { } int monitorStartSystem() { + if (monitor == NULL) { + monitorInitSystem(); + } taosTmrReset(monitorInitConn, 10, NULL, tscTmr, &monitor->initTimer); return 0; } diff --git a/src/system/detail/src/dnodeSystem.c b/src/system/detail/src/dnodeSystem.c index 30b3e202ad..1b5d9418b4 100644 --- a/src/system/detail/src/dnodeSystem.c +++ b/src/system/detail/src/dnodeSystem.c @@ -33,8 +33,8 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Woverflow" -SModule tsModule[TSDB_MOD_MAX]; -uint32_t tsModuleStatus; +SModule tsModule[TSDB_MOD_MAX] = {0}; +uint32_t tsModuleStatus = 0; pthread_mutex_t dmutex; extern int vnodeSelectReqNum; extern int vnodeInsertReqNum;