refact code
This commit is contained in:
parent
f848324d54
commit
1dfeaf8b18
|
@ -79,12 +79,15 @@ _exit:
|
|||
}
|
||||
return code;
|
||||
}
|
||||
int vnodeBegin(SVnode *pVnode) {
|
||||
// alloc buffer pool
|
||||
static int32_t vnodeGetBufPoolToUse(SVnode *pVnode) {
|
||||
int32_t code = 0;
|
||||
|
||||
taosThreadMutexLock(&pVnode->mutex);
|
||||
|
||||
int32_t nTry = 0;
|
||||
while (++nTry) {
|
||||
for (;;) {
|
||||
++nTry;
|
||||
|
||||
if (pVnode->freeList) {
|
||||
vDebug("vgId:%d allocate free buffer pool on %d try, pPool:%p id:%d", TD_VID(pVnode), nTry, pVnode->freeList,
|
||||
pVnode->freeList->id);
|
||||
|
@ -126,26 +129,42 @@ int vnodeBegin(SVnode *pVnode) {
|
|||
|
||||
taosThreadMutexUnlock(&pVnode->mutex);
|
||||
|
||||
_exit:
|
||||
return code;
|
||||
}
|
||||
int vnodeBegin(SVnode *pVnode) {
|
||||
int32_t code = 0;
|
||||
int32_t lino = 0;
|
||||
|
||||
pVnode->state.commitID++;
|
||||
|
||||
// alloc buffer pool
|
||||
code = vnodeGetBufPoolToUse(pVnode);
|
||||
TSDB_CHECK_CODE(code, lino, _exit);
|
||||
|
||||
// begin meta
|
||||
if (metaBegin(pVnode->pMeta, META_BEGIN_HEAP_BUFFERPOOL) < 0) {
|
||||
vError("vgId:%d, failed to begin meta since %s", TD_VID(pVnode), tstrerror(terrno));
|
||||
return -1;
|
||||
code = terrno;
|
||||
TSDB_CHECK_CODE(code, lino, _exit);
|
||||
}
|
||||
|
||||
// begin tsdb
|
||||
if (tsdbBegin(pVnode->pTsdb) < 0) {
|
||||
vError("vgId:%d, failed to begin tsdb since %s", TD_VID(pVnode), tstrerror(terrno));
|
||||
return -1;
|
||||
code = terrno;
|
||||
TSDB_CHECK_CODE(code, lino, _exit);
|
||||
}
|
||||
|
||||
// begin sma
|
||||
if (VND_IS_RSMA(pVnode) && smaBegin(pVnode->pSma) < 0) {
|
||||
vError("vgId:%d, failed to begin sma since %s", TD_VID(pVnode), tstrerror(terrno));
|
||||
return -1;
|
||||
code = terrno;
|
||||
TSDB_CHECK_CODE(code, lino, _exit);
|
||||
}
|
||||
|
||||
return 0;
|
||||
_exit:
|
||||
if (code) {
|
||||
vError("vgId:%d %s failed at line %d since %s", TD_VID(pVnode), __func__, lino, tstrerror(code));
|
||||
}
|
||||
return code;
|
||||
}
|
||||
|
||||
void vnodeUpdCommitSched(SVnode *pVnode) {
|
||||
|
@ -160,7 +179,7 @@ int vnodeShouldCommit(SVnode *pVnode) {
|
|||
}
|
||||
|
||||
SVCommitSched *pSched = &pVnode->commitSched;
|
||||
int64_t nowMs = taosGetMonoTimestampMs();
|
||||
int64_t nowMs = taosGetMonoTimestampMs();
|
||||
|
||||
return (((pVnode->inUse->size > pVnode->inUse->node.size) && (pSched->commitMs + SYNC_VND_COMMIT_MIN_MS < nowMs)) ||
|
||||
(pVnode->inUse->size > 0 && pSched->commitMs + pSched->maxWaitMs < nowMs));
|
||||
|
|
Loading…
Reference in New Issue