diff --git a/include/common/tglobal.h b/include/common/tglobal.h index 125dc50d96d66f5d92ab084a3121a73e27a70756..5c19d23df271698aeef2e88998d246b88b0fb5f1 100644 --- a/include/common/tglobal.h +++ b/include/common/tglobal.h @@ -32,6 +32,7 @@ extern char tsLocalEp[]; extern uint16_t tsServerPort; extern int32_t tsVersion; extern int32_t tsStatusInterval; +extern int32_t tsNumOfSupportVnodes; // common extern int32_t tsMaxShellConns; diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 2e2bf5193d313ca7782788f0f5bcdd6995304c90..b2600e34312fbff66ba2e540e3c8c359ae13777d 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -30,6 +30,7 @@ char tsLocalEp[TSDB_EP_LEN] = {0}; // Local End Point, hostname:port uint16_t tsServerPort = 6030; int32_t tsVersion = 30000000; int32_t tsStatusInterval = 1; // second +int32_t tsNumOfSupportVnodes = 256; // common int32_t tsMaxShellConns = 50000; @@ -355,7 +356,7 @@ static int32_t taosAddSystemCfg(SConfig *pCfg) { static int32_t taosAddServerCfg(SConfig *pCfg) { if (cfgAddDir(pCfg, "dataDir", tsDataDir, 0) != 0) return -1; if (cfgAddFloat(pCfg, "minimalDataDirGB", 2.0f, 0.001f, 10000000, 0) != 0) return -1; - if (cfgAddInt32(pCfg, "supportVnodes", 256, 0, 4096, 0) != 0) return -1; + if (cfgAddInt32(pCfg, "supportVnodes", tsNumOfSupportVnodes, 0, 4096, 0) != 0) return -1; if (cfgAddInt32(pCfg, "maxShellConns", tsMaxShellConns, 10, 50000000, 0) != 0) return -1; if (cfgAddInt32(pCfg, "statusInterval", tsStatusInterval, 1, 30, 0) != 0) return -1; if (cfgAddInt32(pCfg, "minSlidingTime", tsMinSlidingTime, 10, 1000000, 0) != 0) return -1; @@ -541,6 +542,7 @@ static void taosSetSystemCfg(SConfig *pCfg) { static int32_t taosSetServerCfg(SConfig *pCfg) { tsDataSpace.reserved = cfgGetItem(pCfg, "minimalDataDirGB")->fval; + tsNumOfSupportVnodes = cfgGetItem(pCfg, "supportVnodes")->i32; tsMaxShellConns = cfgGetItem(pCfg, "maxShellConns")->i32; tsStatusInterval = cfgGetItem(pCfg, "statusInterval")->i32; tsMinSlidingTime = cfgGetItem(pCfg, "minSlidingTime")->i32; diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c index a42c5587f500e26cda459175315b8f9cafb1723d..b6f52118923ee2fb8065cb61de2050e9a4a69a63 100644 --- a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c +++ b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c @@ -20,7 +20,7 @@ static bool mmDeployRequired(const SMgmtInputOpt *pInput) { if (pInput->pData->dnodeId > 0) return false; if (pInput->pData->clusterId > 0) return false; - if (strcmp(pInput->pData->localEp, pInput->pData->firstEp) != 0) return false; + if (strcmp(tsLocalEp, tsFirst) != 0) return false; return true; } @@ -44,8 +44,8 @@ static void mmBuildOptionForDeploy(SMnodeMgmt *pMgmt, const SMgmtInputOpt *pInpu pOption->selfIndex = 0; SReplica *pReplica = &pOption->replicas[0]; pReplica->id = 1; - pReplica->port = pInput->pData->serverPort; - tstrncpy(pReplica->fqdn, pInput->pData->localFqdn, TSDB_FQDN_LEN); + pReplica->port = tsServerPort; + tstrncpy(pReplica->fqdn, tsLocalFqdn, TSDB_FQDN_LEN); pOption->deploy = true; pMgmt->selfIndex = pOption->selfIndex; diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c index 4c22b186ad189b2097cfb172c1d50c5b7871f468..28f6f5f60f28248fbd1f3609644644b11a6ea5ad 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c @@ -262,11 +262,11 @@ static int32_t vmInit(SMgmtInputOpt *pInput, SMgmtOutputOpt *pOutput) { taosInitRWLatch(&pMgmt->latch); SDiskCfg dCfg = {0}; - tstrncpy(dCfg.dir, pInput->pData->dataDir, TSDB_FILENAME_LEN); + tstrncpy(dCfg.dir, tsDataDir, TSDB_FILENAME_LEN); dCfg.level = 0; dCfg.primary = 1; - SDiskCfg *pDisks = pInput->pData->disks; - int32_t numOfDisks = pInput->pData->numOfDisks; + SDiskCfg *pDisks = tsDiskCfg; + int32_t numOfDisks = tsDiskCfgNum; if (numOfDisks <= 0 || pDisks == NULL) { pDisks = &dCfg; numOfDisks = 1; @@ -328,7 +328,7 @@ _OVER: } static int32_t vmRequire(const SMgmtInputOpt *pInput, bool *required) { - *required = pInput->pData->supportVnodes > 0; + *required = tsNumOfSupportVnodes > 0; return 0; }