From a24087b8d0806fdc0c8fa4059d4e32cf4bdf0ade Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 11 Jan 2022 19:52:02 -0800 Subject: [PATCH] minor changes --- source/dnode/mgmt/impl/src/dndEnv.c | 2 +- source/dnode/mgmt/impl/test/sut/src/sut.cpp | 1 + source/dnode/vnode/impl/src/vnodeMgr.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/dnode/mgmt/impl/src/dndEnv.c b/source/dnode/mgmt/impl/src/dndEnv.c index d6f6bdee06..1bf1ea2b92 100644 --- a/source/dnode/mgmt/impl/src/dndEnv.c +++ b/source/dnode/mgmt/impl/src/dndEnv.c @@ -251,7 +251,6 @@ void dndClose(SDnode *pDnode) { dndCleanupQnode(pDnode); dndCleanupVnodes(pDnode); dndCleanupMgmt(pDnode); - vnodeCleanup(); tfsCleanup(); dndCloseImp(pDnode); @@ -309,6 +308,7 @@ void dndCleanup() { } walCleanUp(); + vnodeCleanup(); rpcCleanup(); taosStopCacheRefreshWorker(); diff --git a/source/dnode/mgmt/impl/test/sut/src/sut.cpp b/source/dnode/mgmt/impl/test/sut/src/sut.cpp index 972b4bb332..c6e6c0006d 100644 --- a/source/dnode/mgmt/impl/test/sut/src/sut.cpp +++ b/source/dnode/mgmt/impl/test/sut/src/sut.cpp @@ -45,6 +45,7 @@ void Testbase::InitLog(const char* path) { void Testbase::Init(const char* path, int16_t port) { SDnodeEnvCfg cfg = {0}; cfg.numOfCommitThreads = 1; + cfg.numOfCores = 1; dndInit(&cfg); char fqdn[] = "localhost"; diff --git a/source/dnode/vnode/impl/src/vnodeMgr.c b/source/dnode/vnode/impl/src/vnodeMgr.c index 15550a899b..fdb96e52e2 100644 --- a/source/dnode/vnode/impl/src/vnodeMgr.c +++ b/source/dnode/vnode/impl/src/vnodeMgr.c @@ -61,8 +61,6 @@ void vnodeCleanup() { return; } - walCleanUp(); - // Stop commit handler pthread_mutex_lock(&(vnodeMgr.mutex)); vnodeMgr.stop = true; -- GitLab