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

TD-2331

This commit is contained in:
Shengliang Guan 2020-12-04 14:10:42 +08:00
parent eede5a7711
commit f538fe33be
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mnode/src/mnodeMnode.c
View File

@ -202,7 +202,7 @@ void mnodeCancelGetNextMnode(void *pIter) {
void mnodeUpdateMnodeEpSet(SMInfos *pMinfos) { void mnodeUpdateMnodeEpSet(SMInfos *pMinfos) {
bool set = false; bool set = false;
SMInfos mInfos = {0}; SMInfos mInfos = {0};
mInfo("vgId:1, update mnodes epSet, numOfEps:%d pMinfos:%p", mnodeGetMnodesNum(), pMinfos); mInfo("vgId:1, update mnodes epSet, numOfMnodes:%d pMinfos:%p", mnodeGetMnodesNum(), pMinfos);
if (pMinfos != NULL) { if (pMinfos != NULL) {
set = true; set = true;
@ -232,9 +232,9 @@ void mnodeUpdateMnodeEpSet(SMInfos *pMinfos) {
} }
mInfos.mnodeNum = index; mInfos.mnodeNum = index;
if (sdbGetReplicaNum() != mInfos.mnodeNum) { if (mInfos.mnodeNum < sdbGetReplicaNum()) {
set = false; set = false;
mDebug("vgId:1, mnodes info not synced, cfg:%d current:%d", sdbGetReplicaNum(), mInfos.mnodeNum); mDebug("vgId:1, mnodes info not synced, current:%d syncCfgNum:%d", mInfos.mnodeNum, sdbGetReplicaNum());
} }
} }
@ -316,15 +316,13 @@ void mnodeGetMnodeInfos(void *pMinfos) {
} }
static int32_t mnodeSendCreateMnodeMsg(int32_t dnodeId, char *dnodeEp) { static int32_t mnodeSendCreateMnodeMsg(int32_t dnodeId, char *dnodeEp) {
mDebug("dnode:%d, send create mnode msg to dnode %s", dnodeId, dnodeEp);
SCreateMnodeMsg *pCreate = rpcMallocCont(sizeof(SCreateMnodeMsg)); SCreateMnodeMsg *pCreate = rpcMallocCont(sizeof(SCreateMnodeMsg));
if (pCreate == NULL) { if (pCreate == NULL) {
return TSDB_CODE_MND_OUT_OF_MEMORY; return TSDB_CODE_MND_OUT_OF_MEMORY;
} else { } else {
pCreate->dnodeId = htonl(dnodeId); pCreate->dnodeId = htonl(dnodeId);
tstrncpy(pCreate->dnodeEp, dnodeEp, sizeof(pCreate->dnodeEp)); tstrncpy(pCreate->dnodeEp, dnodeEp, sizeof(pCreate->dnodeEp));
pCreate->mnodes = tsMInfos; mnodeGetMnodeInfos(&pCreate->mnodes);
bool found = false; bool found = false;
for (int i = 0; i < pCreate->mnodes.mnodeNum; ++i) { for (int i = 0; i < pCreate->mnodes.mnodeNum; ++i) {
if (pCreate->mnodes.mnodeInfos[i].mnodeId == htonl(dnodeId)) { if (pCreate->mnodes.mnodeInfos[i].mnodeId == htonl(dnodeId)) {
@ -338,6 +336,11 @@ static int32_t mnodeSendCreateMnodeMsg(int32_t dnodeId, char *dnodeEp) {
} }
} }
mDebug("dnode:%d, send create mnode msg to dnode %s, numOfMnodes:%d", dnodeId, dnodeEp, pCreate->mnodes.mnodeNum);
for (int32_t i = 0; i < pCreate->mnodes.mnodeNum; ++i) {
mDebug("index:%d, mnodeId:%d ep:%s", i, pCreate->mnodes.mnodeInfos[i].mnodeId, pCreate->mnodes.mnodeInfos[i].mnodeEp);
}
SRpcMsg rpcMsg = {0}; SRpcMsg rpcMsg = {0};
rpcMsg.pCont = pCreate; rpcMsg.pCont = pCreate;
rpcMsg.contLen = sizeof(SCreateMnodeMsg); rpcMsg.contLen = sizeof(SCreateMnodeMsg);

2
src/mnode/src/mnodeSdb.c
View File

@ -344,7 +344,7 @@ void sdbUpdateSync(void *pMnodes) {
} }
syncCfg.replica = index; syncCfg.replica = index;
} else { } else {
mDebug("vgId:1, mInfos input, numOfMnodes:%d", syncCfg.replica); mDebug("vgId:1, mInfos input, numOfMnodes:%d", pMinfos->mnodeNum);
for (index = 0; index < pMinfos->mnodeNum; ++index) { for (index = 0; index < pMinfos->mnodeNum; ++index) {
SMInfo *node = &pMinfos->mnodeInfos[index]; SMInfo *node = &pMinfos->mnodeInfos[index];

2
src/sync/src/syncMain.c
View File

@ -1134,7 +1134,7 @@ static void syncProcessIncommingConnection(int32_t connFd, uint32_t sourceIp) {
pPeer = (i < pNode->replica) ? pNode->peerInfo[i] : NULL; pPeer = (i < pNode->replica) ? pNode->peerInfo[i] : NULL;
if (pPeer == NULL) { if (pPeer == NULL) {
sError("vgId:%d, peer:%s not configured", pNode->vgId, firstPkt.fqdn); sError("vgId:%d, peer:%s:%u not configured", pNode->vgId, firstPkt.fqdn, firstPkt.port);
taosCloseSocket(connFd); taosCloseSocket(connFd);
// syncSendVpeerCfgMsg(sync); // syncSendVpeerCfgMsg(sync);
} else { } else {