diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index 7eb08a8f4f..751edd6f98 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -82,13 +82,13 @@ int32_t vmProcessGetVnodeLoadsReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) { } static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) { + memcpy(pCfg, &vnodeCfgDefault, sizeof(SVnodeCfg)); + pCfg->vgId = pCreate->vgId; + strcpy(pCfg->dbname, pCreate->db); pCfg->wsize = pCreate->cacheBlockSize * 1024 * 1024; pCfg->ssize = 1024; pCfg->lsize = 1024 * 1024; - pCfg->isHeapAllocator = true; - pCfg->ttl = 4; - pCfg->keep = pCreate->daysToKeep0; pCfg->streamMode = pCreate->streamMode; pCfg->isWeak = true; pCfg->tsdbCfg.keep2 = pCreate->daysToKeep0; @@ -96,12 +96,6 @@ static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) { pCfg->tsdbCfg.keep1 = pCreate->daysToKeep0; pCfg->tsdbCfg.lruCacheSize = pCreate->cacheBlockSize; pCfg->tsdbCfg.retentions = pCreate->pRetensions; - pCfg->walCfg.level = TAOS_WAL_WRITE; - pCfg->walCfg.fsyncPeriod = 0; - pCfg->walCfg.retentionPeriod = 0; - pCfg->walCfg.retentionSize = 0; - pCfg->walCfg.rollPeriod = 0; - pCfg->walCfg.segSize = 0; pCfg->walCfg.vgId = pCreate->vgId; pCfg->hashBegin = pCreate->hashBegin; pCfg->hashEnd = pCreate->hashEnd; diff --git a/source/dnode/vnode/src/vnd/vnodeCfg.c b/source/dnode/vnode/src/vnd/vnodeCfg.c index e4508e6442..625a2b3aed 100644 --- a/source/dnode/vnode/src/vnd/vnodeCfg.c +++ b/source/dnode/vnode/src/vnd/vnodeCfg.c @@ -15,30 +15,32 @@ #include "vnodeInt.h" -const SVnodeCfg vnodeCfgDefault = {.vgId = -1, - .dbname = "", - .dbId = 0, - .wsize = 96 * 1024 * 1024, - .ssize = 1 * 1024 * 1024, - .lsize = 1024, - .isHeapAllocator = false, - .ttl = 0, - .keep = 0, - .streamMode = 0, - .isWeak = 0, - .tsdbCfg = {.precision = TWO_STAGE_COMP, - .update = 0, - .compression = 2, - .days = 10, - .minRows = 100, - .maxRows = 4096, - .keep2 = 3650, - .keep0 = 3650, - .keep1 = 3650}, - .walCfg = {.level = TAOS_WAL_WRITE}, - .hashBegin = 0, - .hashEnd = 0, - .hashMethod = 0}; +const SVnodeCfg vnodeCfgDefault = { + .vgId = -1, + .dbname = "", + .dbId = 0, + .wsize = 96 * 1024 * 1024, + .ssize = 1 * 1024 * 1024, + .lsize = 1024, + .isHeapAllocator = false, + .ttl = 0, + .keep = 0, + .streamMode = 0, + .isWeak = 0, + .tsdbCfg = {.precision = TWO_STAGE_COMP, + .update = 0, + .compression = 2, + .days = 10, + .minRows = 100, + .maxRows = 4096, + .keep2 = 3650, + .keep0 = 3650, + .keep1 = 3650}, + .walCfg = + {.vgId = -1, .fsyncPeriod = 0, .retentionPeriod = 0, .rollPeriod = 0, .segSize = 0, .level = TAOS_WAL_WRITE}, + .hashBegin = 0, + .hashEnd = 0, + .hashMethod = 0}; int vnodeCheckCfg(const SVnodeCfg *pCfg) { // TODO