From 1f91ac75258f34d6d76c07f75a8210579f7f704a Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 1 Nov 2020 00:09:39 +0800 Subject: [PATCH] TD-1663 --- src/common/inc/tglobal.h | 14 +++++++------- src/common/src/tglobal.c | 6 +++--- src/dnode/src/dnodeEps.c | 4 ++-- src/dnode/src/dnodeMInfos.c | 16 ++++++++-------- src/dnode/src/dnodeMain.c | 10 +++++----- src/util/src/tconfig.c | 6 +++--- src/vnode/src/vnodeCfg.c | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h index 4636eaac08..b00f4b9f9f 100644 --- a/src/common/inc/tglobal.h +++ b/src/common/inc/tglobal.h @@ -183,13 +183,13 @@ extern int32_t debugFlag; #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize) -void taosInitGlobalCfg(); -bool taosCheckGlobalCfg(); -void taosSetAllDebugFlag(); -bool taosCfgDynamicOptions(char *msg); -int taosGetFqdnPortFromEp(const char *ep, char *fqdn, uint16_t *port); -bool taosCheckBalanceCfgOptions(const char *option, int32_t *vnodeId, int32_t *dnodeId); - +void taosInitGlobalCfg(); +int32_t taosCheckGlobalCfg(); +void taosSetAllDebugFlag(); +bool taosCfgDynamicOptions(char *msg); +int taosGetFqdnPortFromEp(const char *ep, char *fqdn, uint16_t *port); +bool taosCheckBalanceCfgOptions(const char *option, int32_t *vnodeId, int32_t *dnodeId); + #ifdef __cplusplus } #endif diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index bda8945bd2..2fd0a53661 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -1316,7 +1316,7 @@ void taosInitGlobalCfg() { pthread_once(&tsInitGlobalCfgOnce, doInitGlobalConfig); } -bool taosCheckGlobalCfg() { +int32_t taosCheckGlobalCfg() { char fqdn[TSDB_FQDN_LEN]; uint16_t port; @@ -1375,9 +1375,9 @@ bool taosCheckGlobalCfg() { tsSyncPort = tsServerPort + TSDB_PORT_SYNC; tsHttpPort = tsServerPort + TSDB_PORT_HTTP; - // taosPrintGlobalCfg(); + taosPrintGlobalCfg(); - return true; + return 0; } int taosGetFqdnPortFromEp(const char *ep, char *fqdn, uint16_t *port) { diff --git a/src/dnode/src/dnodeEps.c b/src/dnode/src/dnodeEps.c index 90fe3a3a4e..9c90c39181 100644 --- a/src/dnode/src/dnodeEps.c +++ b/src/dnode/src/dnodeEps.c @@ -87,7 +87,7 @@ bool dnodeCheckEpChanged(int32_t dnodeId, char *epstr) { char epSaved[TSDB_EP_LEN + 1]; snprintf(epSaved, TSDB_EP_LEN, "%s:%u", ep->dnodeFqdn, ep->dnodePort); changed = strcmp(epstr, epSaved) != 0; - // tstrncpy(epstr, epSaved, TSDB_EP_LEN); + tstrncpy(epstr, epSaved, TSDB_EP_LEN); } pthread_mutex_unlock(&tsEpsMutex); return changed; @@ -236,7 +236,7 @@ PRASE_EPS_OVER: dnodeResetEps(eps); if (eps) free(eps); - // dnodeUpdateEp(dnodeGetDnodeId(), tsLocalEp, tsLocalFqdn, &tsServerPort); + dnodeUpdateEp(dnodeGetDnodeId(), tsLocalEp, tsLocalFqdn, &tsServerPort); terrno = 0; return 0; diff --git a/src/dnode/src/dnodeMInfos.c b/src/dnode/src/dnodeMInfos.c index 241d966e29..c985db371d 100644 --- a/src/dnode/src/dnodeMInfos.c +++ b/src/dnode/src/dnodeMInfos.c @@ -124,10 +124,10 @@ void dnodeGetEpSetForShell(SRpcEpSet *epSet) { } static void dnodePrintMInfos(SMnodeInfos *minfos) { - // dInfo("print mnode infos, mnodeNum:%d inUse:%d", minfos->mnodeNum, minfos->inUse); - // for (int32_t i = 0; i < minfos->mnodeNum; i++) { - // dInfo("mnode index:%d, %s", minfos->mnodeInfos[i].mnodeId, minfos->mnodeInfos[i].mnodeEp); - // } + dInfo("print mnode infos, mnodeNum:%d inUse:%d", minfos->mnodeNum, minfos->inUse); + for (int32_t i = 0; i < minfos->mnodeNum; i++) { + dInfo("mnode index:%d, %s", minfos->mnodeInfos[i].mnodeId, minfos->mnodeInfos[i].mnodeEp); + } } static void dnodeResetMInfos(SMnodeInfos *minfos) { @@ -240,10 +240,10 @@ PARSE_MINFOS_OVER: if (fp != NULL) fclose(fp); terrno = 0; - // for (int32_t i = 0; i < minfos.mnodeNum; ++i) { - // SMnodeInfo *mInfo = &minfos.mnodeInfos[i]; - // dnodeUpdateEp(mInfo->mnodeId, mInfo->mnodeEp, NULL, NULL); - // } + for (int32_t i = 0; i < minfos.mnodeNum; ++i) { + SMnodeInfo *mInfo = &minfos.mnodeInfos[i]; + dnodeUpdateEp(mInfo->mnodeId, mInfo->mnodeEp, NULL, NULL); + } dnodeResetMInfos(&minfos); return 0; } diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c index 92f1cc00ea..de8652c02a 100644 --- a/src/dnode/src/dnodeMain.c +++ b/src/dnode/src/dnodeMain.c @@ -58,7 +58,7 @@ static const SDnodeComponent tsDnodeComponents[] = { {"dnodecfg", dnodeInitCfg, dnodeCleanupCfg}, {"dnodeeps", dnodeInitEps, dnodeCleanupEps}, {"mnodeinfos",dnodeInitMInfos, dnodeCleanupMInfos}, - // {"globalcfg" ,taosCheckGlobalCfg, NULL}, + {"globalcfg" ,taosCheckGlobalCfg, NULL}, {"wal", walInit, walCleanUp}, {"check", dnodeInitCheck, dnodeCleanupCheck}, // NOTES: dnodeInitCheck must be behind the dnodeinitStorage component !!! {"vread", dnodeInitVnodeRead, dnodeCleanupVnodeRead}, @@ -85,7 +85,9 @@ static int dnodeCreateDir(const char *dir) { static void dnodeCleanupComponents(int32_t stepId) { for (int32_t i = stepId; i >= 0; i--) { - tsDnodeComponents[i].cleanup(); + if (tsDnodeComponents[i].cleanup) { + (*tsDnodeComponents[i].cleanup)(); + } } } @@ -122,14 +124,12 @@ int32_t dnodeInitSystem() { printf("failed to init log file\n"); } - if (!taosReadGlobalCfg() || !taosCheckGlobalCfg()) { + if (!taosReadGlobalCfg()) { taosPrintGlobalCfg(); dError("TDengine read global config failed"); return -1; } - taosPrintGlobalCfg(); - dInfo("start to initialize TDengine"); if (dnodeInitComponents() != 0) { diff --git a/src/util/src/tconfig.c b/src/util/src/tconfig.c index 743c3d489b..f449bfb68b 100644 --- a/src/util/src/tconfig.c +++ b/src/util/src/tconfig.c @@ -356,9 +356,9 @@ bool taosReadGlobalCfg() { taosTFree(line); - // if (debugFlag & DEBUG_TRACE || debugFlag & DEBUG_DEBUG || debugFlag & DEBUG_DUMP) { - // taosSetAllDebugFlag(); - // } + if (debugFlag & DEBUG_TRACE || debugFlag & DEBUG_DEBUG || debugFlag & DEBUG_DUMP) { + taosSetAllDebugFlag(); + } return true; } diff --git a/src/vnode/src/vnodeCfg.c b/src/vnode/src/vnodeCfg.c index 7d064b0762..f0040f8cdf 100644 --- a/src/vnode/src/vnodeCfg.c +++ b/src/vnode/src/vnodeCfg.c @@ -72,7 +72,7 @@ int32_t vnodeReadCfg(SVnodeObj *pVnode) { char file[TSDB_FILENAME_LEN + 30] = {0}; sprintf(file, "%s/vnode%d/config.json", tsVnodeDir, pVnode->vgId); - // vnodeMsg.cfg.vgId = pVnode->vgId; + vnodeMsg.cfg.vgId = pVnode->vgId; fp = fopen(file, "r"); if (!fp) { -- GitLab