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

error code

This commit is contained in:
dmchen 2023-08-16 17:49:17 +08:00
parent e020c4e8c5
commit fee4b875d1
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libs/sync/sync.h
View File

@ -272,7 +272,7 @@ SSyncState syncGetState(int64_t rid);
void syncGetRetryEpSet(int64_t rid, SEpSet* pEpSet); void syncGetRetryEpSet(int64_t rid, SEpSet* pEpSet);
const char* syncStr(ESyncState state); const char* syncStr(ESyncState state);
SSyncCfg syncNodeGetConfig(int64_t rid); int32_t syncNodeGetConfig(int64_t rid, SSyncCfg *cfg);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
source/dnode/vnode/src/vnd/vnodeCommit.c
View File

@ -288,7 +288,7 @@ static int32_t vnodePrepareCommit(SVnode *pVnode, SCommitInfo *pInfo) {
tsem_wait(&pVnode->canCommit); tsem_wait(&pVnode->canCommit);
pVnode->config.syncCfg = syncNodeGetConfig(pVnode->sync); if(syncNodeGetConfig(pVnode->sync, &pVnode->config.syncCfg) != 0) goto _exit;
pVnode->state.commitTerm = pVnode->state.applyTerm; pVnode->state.commitTerm = pVnode->state.applyTerm;

9
source/libs/sync/src/syncMain.c
View File

@ -106,20 +106,19 @@ _err:
return -1; return -1;
} }
SSyncCfg syncNodeGetConfig(int64_t rid){ int32_t syncNodeGetConfig(int64_t rid, SSyncCfg *cfg){
SSyncNode* pSyncNode = syncNodeAcquire(rid); SSyncNode* pSyncNode = syncNodeAcquire(rid);
SSyncCfg cfg = {0};
if (pSyncNode == NULL) { if (pSyncNode == NULL) {
sError("failed to acquire rid:%" PRId64 " of tsNodeReftId for pSyncNode", rid); sError("failed to acquire rid:%" PRId64 " of tsNodeReftId for pSyncNode", rid);
return cfg; return -1;
} }
cfg = pSyncNode->raftCfg.cfg; *cfg = pSyncNode->raftCfg.cfg;
syncNodeRelease(pSyncNode); syncNodeRelease(pSyncNode);
return cfg; return 0;
} }
void syncStop(int64_t rid) { void syncStop(int64_t rid) {