xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

minor changes

This commit is contained in:
Shengliang Guan 2022-01-11 19:44:42 -08:00
parent 0b6d32a3d9
commit 21c69b8bf6
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dnode/mgmt/dnode.h
View File

@ -29,6 +29,7 @@ typedef struct SDnode SDnode;
typedef struct { typedef struct {
int32_t sver; int32_t sver;
int32_t numOfCores; int32_t numOfCores;
int16_t numOfCommitThreads;
int8_t enableTelem; int8_t enableTelem;
char timezone[TSDB_TIMEZONE_LEN]; char timezone[TSDB_TIMEZONE_LEN];
char locale[TSDB_LOCALE_LEN]; char locale[TSDB_LOCALE_LEN];
@ -53,7 +54,6 @@ void dndCleanup();
/* ------------------------ SDnode ----------------------- */ /* ------------------------ SDnode ----------------------- */
typedef struct { typedef struct {
int16_t numOfCommitThreads;
int32_t numOfSupportVnodes; int32_t numOfSupportVnodes;
int32_t statusInterval; int32_t statusInterval;
float numOfThreadsPerCore; float numOfThreadsPerCore;

2
source/dnode/mgmt/daemon/src/daemon.c
View File

@ -139,6 +139,7 @@ void dmnWaitSignal() {
void dnmInitEnvCfg(SDnodeEnvCfg *pCfg) { void dnmInitEnvCfg(SDnodeEnvCfg *pCfg) {
pCfg->sver = 30000000; // 3.0.0.0 pCfg->sver = 30000000; // 3.0.0.0
pCfg->numOfCores = tsNumOfCores; pCfg->numOfCores = tsNumOfCores;
pCfg->numOfCommitThreads = tsNumOfCommitThreads;
pCfg->enableTelem = 0; pCfg->enableTelem = 0;
tstrncpy(pCfg->timezone, tsTimezone, TSDB_TIMEZONE_LEN); tstrncpy(pCfg->timezone, tsTimezone, TSDB_TIMEZONE_LEN);
tstrncpy(pCfg->locale, tsLocale, TSDB_LOCALE_LEN); tstrncpy(pCfg->locale, tsLocale, TSDB_LOCALE_LEN);
@ -149,7 +150,6 @@ void dnmInitEnvCfg(SDnodeEnvCfg *pCfg) {
void dmnInitObjCfg(SDnodeObjCfg *pCfg) { void dmnInitObjCfg(SDnodeObjCfg *pCfg) {
pCfg->numOfSupportVnodes = tsNumOfSupportVnodes; pCfg->numOfSupportVnodes = tsNumOfSupportVnodes;
pCfg->numOfCommitThreads = tsNumOfCommitThreads;
pCfg->statusInterval = tsStatusInterval; pCfg->statusInterval = tsStatusInterval;
pCfg->numOfThreadsPerCore = tsNumOfThreadsPerCore; pCfg->numOfThreadsPerCore = tsNumOfThreadsPerCore;
pCfg->ratioOfQueryCores = tsRatioOfQueryCores; pCfg->ratioOfQueryCores = tsRatioOfQueryCores;

29
source/dnode/mgmt/impl/src/dndEnv.c
View File

@ -183,20 +183,6 @@ SDnode *dndCreate(SDnodeObjCfg *pCfg) {
return NULL; return NULL;
} }
SVnodeOpt vnodeOpt = {
.sver = pDnode->env.sver,
.timezone = pDnode->env.timezone,
.locale = pDnode->env.locale,
.charset = pDnode->env.charset,
.nthreads = pDnode->cfg.numOfCommitThreads,
.putReqToVQueryQFp = dndPutReqToVQueryQ,
};
if (vnodeInit(&vnodeOpt) != 0) {
dError("failed to init vnode since %s", terrstr());
dndClose(pDnode);
return NULL;
}
if (dndInitMgmt(pDnode) != 0) { if (dndInitMgmt(pDnode) != 0) {
dError("failed to init mgmt since %s", terrstr()); dError("failed to init mgmt since %s", terrstr());
dndClose(pDnode); dndClose(pDnode);
@ -296,6 +282,21 @@ int32_t dndInit(const SDnodeEnvCfg *pCfg) {
return -1; return -1;
} }
SVnodeOpt vnodeOpt = {
.sver = pCfg->sver,
.timezone = pCfg->timezone,
.locale = pCfg->locale,
.charset = pCfg->charset,
.nthreads = pCfg->numOfCommitThreads,
.putReqToVQueryQFp = dndPutReqToVQueryQ,
};
if (vnodeInit(&vnodeOpt) != 0) {
dError("failed to init vnode since %s", terrstr());
dndCleanup();
return NULL;
}
memcpy(&dndEnv.cfg, pCfg, sizeof(SDnodeEnvCfg)); memcpy(&dndEnv.cfg, pCfg, sizeof(SDnodeEnvCfg));
dInfo("dnode env is initialized"); dInfo("dnode env is initialized");
return 0; return 0;

1
source/dnode/mgmt/impl/test/sut/src/server.cpp
View File

@ -25,7 +25,6 @@ void* serverLoop(void* param) {
SDnodeObjCfg TestServer::BuildOption(const char* path, const char* fqdn, uint16_t port, const char* firstEp) { SDnodeObjCfg TestServer::BuildOption(const char* path, const char* fqdn, uint16_t port, const char* firstEp) {
SDnodeObjCfg cfg = {0}; SDnodeObjCfg cfg = {0};
cfg.numOfSupportVnodes = 16; cfg.numOfSupportVnodes = 16;
cfg.numOfCommitThreads = 1;
cfg.statusInterval = 1; cfg.statusInterval = 1;
cfg.numOfThreadsPerCore = 1; cfg.numOfThreadsPerCore = 1;
cfg.ratioOfQueryCores = 1; cfg.ratioOfQueryCores = 1;

1
source/dnode/mgmt/impl/test/sut/src/sut.cpp
View File

@ -44,6 +44,7 @@ void Testbase::InitLog(const char* path) {
void Testbase::Init(const char* path, int16_t port) { void Testbase::Init(const char* path, int16_t port) {
SDnodeEnvCfg cfg = {0}; SDnodeEnvCfg cfg = {0};
cfg.numOfCommitThreads = 1;
dndInit(&cfg); dndInit(&cfg);
char fqdn[] = "localhost"; char fqdn[] = "localhost";