From a1c8ec36bbd651b89b82c7cf426641dc00052e9e Mon Sep 17 00:00:00 2001 From: slguan Date: Fri, 17 Apr 2020 21:04:43 +0800 Subject: [PATCH] [TD-52] fix bug in sdb sync --- src/dnode/inc/dnodeMClient.h | 2 -- src/dnode/src/dnodeMgmt.c | 2 +- src/dnode/src/dnodeModule.c | 2 +- src/inc/dnode.h | 2 ++ src/inc/taosmsg.h | 1 + src/mnode/inc/mgmtDnode.h | 1 - src/mnode/src/mgmtDnode.c | 12 +++++------- src/mnode/src/mgmtMain.c | 9 +++++---- src/mnode/src/mgmtMnode.c | 6 ++++++ src/mnode/src/mgmtSdb.c | 12 +++++++----- src/mnode/src/mgmtUser.c | 3 ++- src/util/src/tglobalcfg.c | 7 +------ 12 files changed, 31 insertions(+), 28 deletions(-) diff --git a/src/dnode/inc/dnodeMClient.h b/src/dnode/inc/dnodeMClient.h index fdaf54e0e5..6d413ada88 100644 --- a/src/dnode/inc/dnodeMClient.h +++ b/src/dnode/inc/dnodeMClient.h @@ -23,8 +23,6 @@ extern "C" { int32_t dnodeInitMClient(); void dnodeCleanupMClient(); void dnodeSendMsgToMnode(SRpcMsg *rpcMsg); -void * dnodeGetMnodeList(); -int32_t dnodeGetDnodeId(); #ifdef __cplusplus } diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c index abfee2239b..8f62e3adc0 100644 --- a/src/dnode/src/dnodeMgmt.c +++ b/src/dnode/src/dnodeMgmt.c @@ -22,11 +22,11 @@ #include "trpc.h" #include "tsdb.h" #include "twal.h" +#include "vnode.h" #include "dnodeMClient.h" #include "dnodeMgmt.h" #include "dnodeRead.h" #include "dnodeWrite.h" -#include "vnode.h" static int32_t dnodeOpenVnodes(); static void dnodeCloseVnodes(); diff --git a/src/dnode/src/dnodeModule.c b/src/dnode/src/dnodeModule.c index c50391613e..57ef655078 100644 --- a/src/dnode/src/dnodeModule.c +++ b/src/dnode/src/dnodeModule.c @@ -118,7 +118,7 @@ void dnodeProcessModuleStatus(uint32_t moduleStatus) { dPrint("module status is received, start mgmt module", tsModuleStatus, moduleStatus); tsModule[TSDB_MOD_MGMT].enable = true; dnodeSetModuleStatus(TSDB_MOD_MGMT); - (*tsModule[TSDB_MOD_MGMT].stopFp)(); + (*tsModule[TSDB_MOD_MGMT].startFp)(); } if (tsModule[TSDB_MOD_MGMT].enable && !enableMgmtModule) { diff --git a/src/inc/dnode.h b/src/inc/dnode.h index 6215b5a7ee..0be18a007e 100644 --- a/src/inc/dnode.h +++ b/src/inc/dnode.h @@ -43,6 +43,8 @@ void dnodeSendRpcWriteRsp(void *pVnode, void *param, int32_t code); bool dnodeIsFirstDeploy(); uint32_t dnodeGetMnodeMasteIp(); +void * dnodeGetMnodeList(); +int32_t dnodeGetDnodeId(); #ifdef __cplusplus } diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h index 79d086153a..f292345e68 100644 --- a/src/inc/taosmsg.h +++ b/src/inc/taosmsg.h @@ -584,6 +584,7 @@ typedef struct { char dnodeName[TSDB_NODE_NAME_LEN + 1]; uint32_t privateIp; uint32_t publicIp; + uint32_t moduleStatus; uint32_t lastReboot; // time stamp for last reboot uint16_t numOfTotalVnodes; // from config file uint16_t openVnodes; diff --git a/src/mnode/inc/mgmtDnode.h b/src/mnode/inc/mgmtDnode.h index 14bb6e04e5..48111d3110 100644 --- a/src/mnode/inc/mgmtDnode.h +++ b/src/mnode/inc/mgmtDnode.h @@ -31,7 +31,6 @@ int32_t mgmtInitDnodes(); void mgmtCleanupDnodes(); char* mgmtGetDnodeStatusStr(int32_t dnodeStatus); -bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int moduleType); void mgmtMonitorDnodeModule(); int32_t mgmtGetDnodesNum(); diff --git a/src/mnode/src/mgmtDnode.c b/src/mnode/src/mgmtDnode.c index 89c4796d85..3c66ff6c57 100644 --- a/src/mnode/src/mgmtDnode.c +++ b/src/mnode/src/mgmtDnode.c @@ -129,7 +129,7 @@ static int32_t mgmtDnodeActionDecode(SSdbOperDesc *pOper) { static int32_t mgmtDnodeActionRestored() { int32_t numOfRows = sdbGetNumOfRows(tsDnodeSdb); - if (numOfRows <= 0 && strcmp(tsMasterIp, tsPrivateIp) == 0) { + if (numOfRows <= 0 && dnodeIsFirstDeploy()) { uint32_t ip = inet_addr(tsPrivateIp); mgmtCreateDnode(ip); SDnodeObj *pDnode = mgmtGetDnodeByIp(ip); @@ -276,6 +276,7 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { pStatus->dnodeId = htonl(pStatus->dnodeId); pStatus->privateIp = htonl(pStatus->privateIp); pStatus->publicIp = htonl(pStatus->publicIp); + pStatus->moduleStatus = htonl(pStatus->moduleStatus); pStatus->lastReboot = htonl(pStatus->lastReboot); pStatus->numOfCores = htons(pStatus->numOfCores); pStatus->numOfTotalVnodes = htons(pStatus->numOfTotalVnodes); @@ -311,6 +312,7 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { pDnode->diskAvailable = pStatus->diskAvailable; pDnode->alternativeRole = pStatus->alternativeRole; pDnode->totalVnodes = pStatus->numOfTotalVnodes; + pDnode->moduleStatus = pStatus->moduleStatus; if (pStatus->dnodeId == 0) { mTrace("dnode:%d, first access, privateIp:%s, name:%s", pDnode->dnodeId, taosIpStr(pDnode->privateIp), pDnode->dnodeName); @@ -353,7 +355,7 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { mgmtGetMnodeList(&pRsp->mnodes); pRsp->dnodeState.dnodeId = htonl(pDnode->dnodeId); - pRsp->dnodeState.moduleStatus = htonl(pDnode->moduleStatus); + pRsp->dnodeState.moduleStatus = htonl((int32_t)pDnode->isMgmt); pRsp->dnodeState.createdTime = htonl(pDnode->createdTime / 1000); pRsp->dnodeState.numOfVnodes = 0; @@ -391,10 +393,6 @@ static int32_t mgmtCreateDnode(uint32_t ip) { pDnode->totalVnodes = TSDB_INVALID_VNODE_NUM; sprintf(pDnode->dnodeName, "n%d", sdbGetId(tsDnodeSdb) + 1); - if (pDnode->privateIp == inet_addr(tsMasterIp)) { - pDnode->moduleStatus |= (1 << TSDB_MOD_MGMT); - } - SSdbOperDesc oper = { .type = SDB_OPER_GLOBAL, .table = tsDnodeSdb, @@ -620,7 +618,7 @@ static int32_t mgmtRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, voi return numOfRows; } -bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType) { +static bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType) { uint32_t status = pDnode->moduleStatus & (1 << moduleType); return status > 0; } diff --git a/src/mnode/src/mgmtMain.c b/src/mnode/src/mgmtMain.c index 371a09c03f..38f18b462a 100644 --- a/src/mnode/src/mgmtMain.c +++ b/src/mnode/src/mgmtMain.c @@ -20,6 +20,7 @@ #include "treplica.h" #include "tgrant.h" #include "ttimer.h" +#include "dnode.h" #include "mgmtDef.h" #include "mgmtLog.h" #include "mgmtAcct.h" @@ -100,6 +101,10 @@ int32_t mgmtStartSystem() { return -1; } + if (replicaInit() < 0) { + mError("failed to init replica") + } + if (mgmtInitDClient() < 0) { return -1; } @@ -108,10 +113,6 @@ int32_t mgmtStartSystem() { return -1; } - if (replicaInit() < 0) { - mError("failed to init dnode balance") - } - grantReset(TSDB_GRANT_ALL, 0); tsMgmtIsRunning = true; diff --git a/src/mnode/src/mgmtMnode.c b/src/mnode/src/mgmtMnode.c index e469dc4f6f..8087ce5ad1 100644 --- a/src/mnode/src/mgmtMnode.c +++ b/src/mnode/src/mgmtMnode.c @@ -55,6 +55,12 @@ static int32_t mgmtMnodeActionInsert(SSdbOperDesc *pOper) { static int32_t mgmtMnodeActionDelete(SSdbOperDesc *pOper) { SMnodeObj *pMnode = pOper->pObj; + + SDnodeObj *pDnode = mgmtGetDnode(pMnode->mnodeId); + if (pDnode == NULL) return TSDB_CODE_DNODE_NOT_EXIST; + pDnode->isMgmt = false; + mgmtReleaseDnode(pDnode); + mTrace("mnode:%d, is dropped from sdb", pMnode->mnodeId); return TSDB_CODE_SUCCESS; } diff --git a/src/mnode/src/mgmtSdb.c b/src/mnode/src/mgmtSdb.c index 013c0236d0..4bc18d6a0d 100644 --- a/src/mnode/src/mgmtSdb.c +++ b/src/mnode/src/mgmtSdb.c @@ -69,10 +69,16 @@ static void *(*sdbGetIndexFp[])(void *handle, void *key) = {sdbGetStrHashData, s static void (*sdbCleanUpIndexFp[])(void *handle) = {sdbCloseStrHash, sdbCloseIntHash, sdbCloseIntHash}; static void *(*sdbFetchRowFp[])(void *handle, void *ptr, void **ppRow) = {sdbFetchStrHashData, sdbFetchIntHashData, sdbFetchIntHashData}; -uint64_t sdbGetVersion() { return tsSdbObj->version; } int32_t sdbGetId(void *handle) { return ((SSdbTable *)handle)->autoIndex; } int64_t sdbGetNumOfRows(void *handle) { return ((SSdbTable *)handle)->numOfRows; } +uint64_t sdbGetVersion() { + if (tsSdbObj) + return tsSdbObj->version; + else + return 0; +} + static char *sdbGetActionStr(int32_t action) { switch (action) { case SDB_ACTION_INSERT: @@ -147,10 +153,6 @@ void sdbCleanUp() { } } -SSdbObject *sdbGetObj() { - return tsSdbObj; -} - void sdbIncRef(void *handle, void *pRow) { if (pRow) { SSdbTable *pTable = handle; diff --git a/src/mnode/src/mgmtUser.c b/src/mnode/src/mgmtUser.c index 92037ba793..9098a0c17d 100644 --- a/src/mnode/src/mgmtUser.c +++ b/src/mnode/src/mgmtUser.c @@ -18,6 +18,7 @@ #include "trpc.h" #include "ttime.h" #include "tutil.h" +#include "dnode.h" #include "mgmtDef.h" #include "mgmtLog.h" #include "mgmtAcct.h" @@ -93,7 +94,7 @@ static int32_t mgmtUserActionDecode(SSdbOperDesc *pOper) { } static int32_t mgmtUserActionRestored() { - if (strcmp(tsMasterIp, tsPrivateIp) == 0) { + if (dnodeIsFirstDeploy()) { SAcctObj *pAcct = mgmtGetAcct("root"); mgmtCreateUser(pAcct, "root", "taosdata"); mgmtCreateUser(pAcct, "monitor", tsInternalPass); diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c index 8ce4530dbf..d912301641 100644 --- a/src/util/src/tglobalcfg.c +++ b/src/util/src/tglobalcfg.c @@ -110,12 +110,7 @@ short tsDaysPerFile = 10; int tsDaysToKeep = 3650; int tsReplications = TSDB_REPLICA_MIN_NUM; -#ifdef _MPEER int tsNumOfMPeers = 3; -#else -int tsNumOfMPeers = 1; -#endif - int tsMaxShellConns = 2000; int tsMaxTables = 100000; @@ -556,7 +551,7 @@ static void doInitGlobalConfig() { tsInitConfigOption(cfg++, "tblocks", &tsNumOfBlocksPerMeter, TSDB_CFG_VTYPE_SHORT, TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW, 32, 4096, 0, TSDB_CFG_UTYPE_NONE); -#ifdef _MPEER +#ifdef _SYNC tsInitConfigOption(cfg++, "numOfMPeers", &tsNumOfMPeers, TSDB_CFG_VTYPE_INT, TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER, 1, 3, 0, TSDB_CFG_UTYPE_NONE); -- GitLab