提交 706aa1da 编写于 作者: C Cary Xu

chore: code optimization for rsma

上级 e9977800
...@@ -89,18 +89,18 @@ int32_t smaBegin(SSma *pSma) { ...@@ -89,18 +89,18 @@ int32_t smaBegin(SSma *pSma) {
if ((code = tsdbBegin(VND_RSMA1(pVnode))) < 0) { if ((code = tsdbBegin(VND_RSMA1(pVnode))) < 0) {
smaError("vgId:%d, failed to begin rsma1 since %s", TD_VID(pVnode), tstrerror(code)); smaError("vgId:%d, failed to begin rsma1 since %s", TD_VID(pVnode), tstrerror(code));
return code; goto _exit;
} }
if ((code = tsdbBegin(VND_RSMA2(pVnode))) < 0) { if ((code = tsdbBegin(VND_RSMA2(pVnode))) < 0) {
smaError("vgId:%d, failed to begin rsma2 since %s", TD_VID(pVnode), tstrerror(code)); smaError("vgId:%d, failed to begin rsma2 since %s", TD_VID(pVnode), tstrerror(code));
return code; goto _exit;
} }
// set trigger stat // set trigger stat
SSmaEnv *pSmaEnv = SMA_RSMA_ENV(pSma); SSmaEnv *pSmaEnv = SMA_RSMA_ENV(pSma);
if (!pSmaEnv) { if (!pSmaEnv) {
return code; goto _exit;
} }
SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pSmaEnv); SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pSmaEnv);
int8_t rsmaTriggerStat = int8_t rsmaTriggerStat =
...@@ -117,10 +117,12 @@ int32_t smaBegin(SSma *pSma) { ...@@ -117,10 +117,12 @@ int32_t smaBegin(SSma *pSma) {
} }
default: { default: {
atomic_store_8(RSMA_TRIGGER_STAT(pRSmaStat), TASK_TRIGGER_STAT_ACTIVE); atomic_store_8(RSMA_TRIGGER_STAT(pRSmaStat), TASK_TRIGGER_STAT_ACTIVE);
smaError("vgId:%d, rsma trigger stat %" PRIi8 " is unexpected", TD_VID(pVnode), rsmaTriggerStat); smaWarn("vgId:%d, rsma trigger stat %" PRIi8 " is unexpected", TD_VID(pVnode), rsmaTriggerStat);
break; break;
} }
} }
_exit:
terrno = code;
return code; return code;
} }
......
...@@ -52,7 +52,10 @@ int vnodeBegin(SVnode *pVnode) { ...@@ -52,7 +52,10 @@ int vnodeBegin(SVnode *pVnode) {
} }
// begin sma // begin sma
smaBegin(pVnode->pSma); if (smaBegin(pVnode->pSma) < 0) {
vError("vgId:%d, failed to begin sma since %s", TD_VID(pVnode), tstrerror(terrno));
return -1;
}
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册