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

TD-2798

This commit is contained in:
Shengliang Guan 2021-01-22 18:40:24 +08:00
parent a5ddcb38d4
commit 6bf66d5d50
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dnode/src/dnodeVMgmt.c
View File

@ -174,7 +174,7 @@ static int32_t dnodeProcessAlterVnodeMsg(SRpcMsg *rpcMsg) {
vnodeRelease(pVnode); vnodeRelease(pVnode);
return code; return code;
} else { } else {
dError("vgId:%d, vnode not exist, can't alter it", pAlter->cfg.vgId); dInfo("vgId:%d, vnode not exist, can't alter it", pAlter->cfg.vgId);
return TSDB_CODE_VND_INVALID_VGROUP_ID; return TSDB_CODE_VND_INVALID_VGROUP_ID;
} }
} }

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

@ -224,7 +224,7 @@ static int32_t syncRestoreDataStepByStep(SSyncPeer *pPeer) {
int32_t code = syncRestoreFile(pPeer, &fversion); int32_t code = syncRestoreFile(pPeer, &fversion);
if (code < 0) { if (code < 0) {
sError("%s, failed to restore file", pPeer->id); sError("%s, failed to restore files", pPeer->id);
return -1; return -1;
} }

18
src/tsdb/src/tsdbSync.c
View File

@ -123,6 +123,7 @@ static int32_t tsdbSyncSendMeta(SSyncH *pSynch) {
SMFile mf; SMFile mf;
// Send meta info to remote // Send meta info to remote
tsdbInfo("vgId:%d, metainfo will be sent", REPO_ID(pRepo));
if (tsdbSendMetaInfo(pSynch) < 0) { if (tsdbSendMetaInfo(pSynch) < 0) {
tsdbError("vgId:%d, failed to send metainfo since %s", REPO_ID(pRepo), tstrerror(terrno)); tsdbError("vgId:%d, failed to send metainfo since %s", REPO_ID(pRepo), tstrerror(terrno));
return -1; return -1;
@ -140,8 +141,6 @@ static int32_t tsdbSyncSendMeta(SSyncH *pSynch) {
} }
if (toSendMeta) { if (toSendMeta) {
tsdbInfo("vgId:%d, metafile will be sent", REPO_ID(pRepo));
tsdbInitMFileEx(&mf, pRepo->fs->cstatus->pmf); tsdbInitMFileEx(&mf, pRepo->fs->cstatus->pmf);
if (tsdbOpenMFile(&mf, O_RDONLY) < 0) { if (tsdbOpenMFile(&mf, O_RDONLY) < 0) {
tsdbError("vgId:%d, failed to open file while send metafile since %s", REPO_ID(pRepo), tstrerror(terrno)); tsdbError("vgId:%d, failed to open file while send metafile since %s", REPO_ID(pRepo), tstrerror(terrno));
@ -149,6 +148,8 @@ static int32_t tsdbSyncSendMeta(SSyncH *pSynch) {
} }
int32_t writeLen = mf.info.size; int32_t writeLen = mf.info.size;
tsdbInfo("vgId:%d, metafile:%s will be sent, size:%d", REPO_ID(pRepo), mf.f.aname, writeLen);
int32_t ret = taosSendFile(pSynch->socketFd, TSDB_FILE_FD(&mf), 0, writeLen); int32_t ret = taosSendFile(pSynch->socketFd, TSDB_FILE_FD(&mf), 0, writeLen);
if (ret != writeLen) { if (ret != writeLen) {
terrno = TAOS_SYSTEM_ERROR(errno); terrno = TAOS_SYSTEM_ERROR(errno);
@ -159,7 +160,7 @@ static int32_t tsdbSyncSendMeta(SSyncH *pSynch) {
} }
tsdbCloseMFile(&mf); tsdbCloseMFile(&mf);
tsdbInfo("vgId:%d, metafile is sent, size:%d", REPO_ID(pRepo), writeLen); tsdbInfo("vgId:%d, metafile is sent", REPO_ID(pRepo));
} else { } else {
tsdbInfo("vgId:%d, metafile is same, no need to send", REPO_ID(pRepo)); tsdbInfo("vgId:%d, metafile is same, no need to send", REPO_ID(pRepo));
} }
@ -208,6 +209,8 @@ static int32_t tsdbSyncRecvMeta(SSyncH *pSynch) {
return -1; return -1;
} }
tsdbInfo("vgId:%d, metafile:%s is created", REPO_ID(pRepo), mf.f.aname);
int32_t readLen = pSynch->pmf->info.size; int32_t readLen = pSynch->pmf->info.size;
int32_t ret = taosCopyFds(pSynch->socketFd, TSDB_FILE_FD(&mf), readLen); int32_t ret = taosCopyFds(pSynch->socketFd, TSDB_FILE_FD(&mf), readLen);
if (ret != readLen) { if (ret != readLen) {
@ -266,6 +269,7 @@ static int32_t tsdbSendMetaInfo(SSyncH *pSynch) {
return -1; return -1;
} }
tsdbInfo("vgId:%d, metainfo is sent, tlen:%d, writeLen:%d", REPO_ID(pRepo), tlen, writeLen);
return 0; return 0;
} }
@ -278,13 +282,13 @@ static int32_t tsdbRecvMetaInfo(SSyncH *pSynch) {
int32_t ret = taosReadMsg(pSynch->socketFd, buf, readLen); int32_t ret = taosReadMsg(pSynch->socketFd, buf, readLen);
if (ret != readLen) { if (ret != readLen) {
terrno = TAOS_SYSTEM_ERROR(errno); terrno = TAOS_SYSTEM_ERROR(errno);
tsdbError("vgId:%d, failed to recv metainfo len, ret:%d readLen:%d", REPO_ID(pRepo), ret, readLen); tsdbError("vgId:%d, failed to recv metalen, ret:%d readLen:%d", REPO_ID(pRepo), ret, readLen);
return -1; return -1;
} }
taosDecodeFixedU32(buf, &tlen); taosDecodeFixedU32(buf, &tlen);
tsdbInfo("vgId:%d, metainfo len:%d is received", REPO_ID(pRepo), tlen); tsdbInfo("vgId:%d, metalen is received, readLen:%d, tlen:%d", REPO_ID(pRepo), readLen, tlen);
if (tlen == 0) { if (tlen == 0) {
pSynch->pmf = NULL; pSynch->pmf = NULL;
return 0; return 0;
@ -298,11 +302,11 @@ static int32_t tsdbRecvMetaInfo(SSyncH *pSynch) {
ret = taosReadMsg(pSynch->socketFd, SYNC_BUFFER(pSynch), tlen); ret = taosReadMsg(pSynch->socketFd, SYNC_BUFFER(pSynch), tlen);
if (ret != tlen) { if (ret != tlen) {
terrno = TAOS_SYSTEM_ERROR(errno); terrno = TAOS_SYSTEM_ERROR(errno);
tsdbError("vgId:%d, failed to recv metainfo, ret:%d readLen:%d", REPO_ID(pRepo), ret, tlen); tsdbError("vgId:%d, failed to recv metainfo, ret:%d tlen:%d", REPO_ID(pRepo), ret, tlen);
return -1; return -1;
} }
tsdbInfo("vgId:%d, metainfo is received", REPO_ID(pRepo)); tsdbInfo("vgId:%d, metainfo is received, tlen:%d", REPO_ID(pRepo), tlen);
if (!taosCheckChecksumWhole((uint8_t *)SYNC_BUFFER(pSynch), tlen)) { if (!taosCheckChecksumWhole((uint8_t *)SYNC_BUFFER(pSynch), tlen)) {
terrno = TSDB_CODE_TDB_MESSED_MSG; terrno = TSDB_CODE_TDB_MESSED_MSG;
tsdbError("vgId:%d, failed to checksum while recv metainfo since %s", REPO_ID(pRepo), tstrerror(terrno)); tsdbError("vgId:%d, failed to checksum while recv metainfo since %s", REPO_ID(pRepo), tstrerror(terrno));