Merge pull request #3970 from taosdata/feature/os

TD-1710
This commit is contained in:
Shengliang Guan 2020-10-23 14:40:05 +08:00 committed by GitHub
commit 1e14f7222f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions

View File

@ -97,7 +97,7 @@ void dnodeCleanupModules() {
} }
} }
if (tsModule[TSDB_MOD_MNODE].enable && tsModule[TSDB_MOD_MNODE].cleanUpFp) { if (tsModule[TSDB_MOD_MNODE].cleanUpFp) {
(*tsModule[TSDB_MOD_MNODE].cleanUpFp)(); (*tsModule[TSDB_MOD_MNODE].cleanUpFp)();
} }
} }

View File

@ -123,6 +123,7 @@ int32_t mnodeInitSystem() {
} }
void mnodeCleanupSystem() { void mnodeCleanupSystem() {
if (tsMgmtIsRunning) {
mInfo("starting to clean up mnode"); mInfo("starting to clean up mnode");
tsMgmtIsRunning = false; tsMgmtIsRunning = false;
@ -134,6 +135,7 @@ void mnodeCleanupSystem() {
mInfo("mnode is cleaned up"); mInfo("mnode is cleaned up");
} }
}
void mnodeStopSystem() { void mnodeStopSystem() {
if (sdbIsMaster()) { if (sdbIsMaster()) {