未验证 提交 1e14f722 编写于 作者: S Shengliang Guan 提交者: GitHub

Merge pull request #3970 from taosdata/feature/os

TD-1710
...@@ -97,7 +97,7 @@ void dnodeCleanupModules() { ...@@ -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)();
} }
} }
......
...@@ -123,16 +123,18 @@ int32_t mnodeInitSystem() { ...@@ -123,16 +123,18 @@ int32_t mnodeInitSystem() {
} }
void mnodeCleanupSystem() { void mnodeCleanupSystem() {
mInfo("starting to clean up mnode"); if (tsMgmtIsRunning) {
tsMgmtIsRunning = false; mInfo("starting to clean up mnode");
tsMgmtIsRunning = false;
dnodeFreeMnodeWqueue();
dnodeFreeMnodeRqueue(); dnodeFreeMnodeWqueue();
dnodeFreeMnodePqueue(); dnodeFreeMnodeRqueue();
mnodeCleanupTimer(); dnodeFreeMnodePqueue();
mnodeCleanupComponents(sizeof(tsMnodeComponents) / sizeof(tsMnodeComponents[0]) - 1); mnodeCleanupTimer();
mnodeCleanupComponents(sizeof(tsMnodeComponents) / sizeof(tsMnodeComponents[0]) - 1);
mInfo("mnode is cleaned up");
mInfo("mnode is cleaned up");
}
} }
void mnodeStopSystem() { void mnodeStopSystem() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册