From 5d835bc5b1b5acf344d7398bee43a0e4b39ba166 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 6 Apr 2022 21:16:31 +0800 Subject: [PATCH] cfg for multi process --- include/common/tglobal.h | 7 +++++++ source/common/src/tglobal.c | 21 ++++++++++++++++++++- source/util/src/tprocess.c | 1 - 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/include/common/tglobal.h b/include/common/tglobal.h index 089cb5bb94..94f294d2bf 100644 --- a/include/common/tglobal.h +++ b/include/common/tglobal.h @@ -51,7 +51,14 @@ extern int32_t tsCompatibleModel; extern bool tsEnableSlaveQuery; extern bool tsPrintAuth; extern int64_t tsTickPerDay[3]; + +// multi-process extern bool tsMultiProcess; +extern int32_t tsMnodeShmSize; +extern int32_t tsVnodeShmSize; +extern int32_t tsQnodeShmSize; +extern int32_t tsSnodeShmSize; +extern int32_t tsBnodeShmSize; // monitor extern bool tsEnableMonitor; diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index c79e153122..3f4639a9dc 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -45,7 +45,14 @@ float tsRatioOfQueryCores = 1.0f; int32_t tsMaxBinaryDisplayWidth = 30; bool tsEnableSlaveQuery = 1; bool tsPrintAuth = 0; -bool tsMultiProcess = 0; + +// multi process +bool tsMultiProcess = false; +int32_t tsMnodeShmSize = TSDB_MAX_WAL_SIZE * 1; +int32_t tsVnodeShmSize = TSDB_MAX_WAL_SIZE * 10; +int32_t tsQnodeShmSize = TSDB_MAX_WAL_SIZE * 4; +int32_t tsSnodeShmSize = TSDB_MAX_WAL_SIZE * 4; +int32_t tsBnodeShmSize = TSDB_MAX_WAL_SIZE * 4; // monitor bool tsEnableMonitor = 1; @@ -347,7 +354,13 @@ static int32_t taosAddServerCfg(SConfig *pCfg) { if (cfgAddBool(pCfg, "printAuth", tsPrintAuth, 0) != 0) return -1; if (cfgAddBool(pCfg, "slaveQuery", tsEnableSlaveQuery, 0) != 0) return -1; if (cfgAddBool(pCfg, "deadLockKillQuery", tsDeadLockKillQuery, 0) != 0) return -1; + if (cfgAddBool(pCfg, "multiProcess", tsMultiProcess, 0) != 0) return -1; + if (cfgAddInt32(pCfg, "mnodeShmSize", tsMnodeShmSize, 4096, INT32_MAX, 0) != 0) return -1; + if (cfgAddInt32(pCfg, "vnodeShmSize", tsVnodeShmSize, 4096, INT32_MAX, 0) != 0) return -1; + if (cfgAddInt32(pCfg, "qnodeShmSize", tsQnodeShmSize, 4096, INT32_MAX, 0) != 0) return -1; + if (cfgAddInt32(pCfg, "snodeShmSize", tsSnodeShmSize, 4096, INT32_MAX, 0) != 0) return -1; + // if (cfgAddInt32(pCfg, "bnodeShmSize", tsBnodeShmSize, 4096, INT32_MAX, 0) != 0) return -1; if (cfgAddBool(pCfg, "monitor", tsEnableMonitor, 0) != 0) return -1; if (cfgAddInt32(pCfg, "monitorInterval", tsMonitorInterval, 1, 360000, 0) != 0) return -1; @@ -466,7 +479,13 @@ static int32_t taosSetServerCfg(SConfig *pCfg) { tsPrintAuth = cfgGetItem(pCfg, "printAuth")->bval; tsEnableSlaveQuery = cfgGetItem(pCfg, "slaveQuery")->bval; tsDeadLockKillQuery = cfgGetItem(pCfg, "deadLockKillQuery")->bval; + tsMultiProcess = cfgGetItem(pCfg, "multiProcess")->bval; + tsMnodeShmSize = cfgGetItem(pCfg, "mnodeShmSize")->i32; + tsVnodeShmSize = cfgGetItem(pCfg, "vnodeShmSize")->i32; + tsQnodeShmSize = cfgGetItem(pCfg, "qnodeShmSize")->i32; + tsSnodeShmSize = cfgGetItem(pCfg, "snodeShmSize")->i32; + tsBnodeShmSize = cfgGetItem(pCfg, "bnodeShmSize")->i32; tsEnableMonitor = cfgGetItem(pCfg, "monitor")->bval; tsMonitorInterval = cfgGetItem(pCfg, "monitorInterval")->i32; diff --git a/source/util/src/tprocess.c b/source/util/src/tprocess.c index 74adfbd976..ad7ed51d4e 100644 --- a/source/util/src/tprocess.c +++ b/source/util/src/tprocess.c @@ -21,7 +21,6 @@ #include "tlog.h" #include "tqueue.h" -#define SHM_DEFAULT_SIZE (20 * 1024 * 1024) typedef void *(*ProcThreadFp)(void *param); typedef struct SProcQueue {