提交 0bf74d09 编写于 作者: Y yihaoDeng

Merge branch 'enh/triggerCheckPoint2' of https://github.com/taosdata/TDengine...

Merge branch 'enh/triggerCheckPoint2' of https://github.com/taosdata/TDengine into enh/triggerCheckPoint2
...@@ -1166,7 +1166,7 @@ static int32_t mndProcessStreamDoCheckpoint(SRpcMsg *pReq) { ...@@ -1166,7 +1166,7 @@ static int32_t mndProcessStreamDoCheckpoint(SRpcMsg *pReq) {
mError("failed to trigger checkpoint, reason: %s", tstrerror(TSDB_CODE_OUT_OF_MEMORY)); mError("failed to trigger checkpoint, reason: %s", tstrerror(TSDB_CODE_OUT_OF_MEMORY));
return -1; return -1;
} }
mDebug("start to trigger checkpoint"); mDebug("start to trigger checkpoint, checkpointId: %" PRId64 "", checkpointId);
mndTransSetDbName(pTrans, "checkpoint", "checkpoint"); mndTransSetDbName(pTrans, "checkpoint", "checkpoint");
if (mndTransCheckConflict(pMnode, pTrans) != 0) { if (mndTransCheckConflict(pMnode, pTrans) != 0) {
...@@ -1181,11 +1181,10 @@ static int32_t mndProcessStreamDoCheckpoint(SRpcMsg *pReq) { ...@@ -1181,11 +1181,10 @@ static int32_t mndProcessStreamDoCheckpoint(SRpcMsg *pReq) {
if (pIter == NULL) break; if (pIter == NULL) break;
code = mndAddStreamCheckpointToTrans(pTrans, pStream, pMnode, checkpointId); code = mndAddStreamCheckpointToTrans(pTrans, pStream, pMnode, checkpointId);
sdbRelease(pSdb, pStream);
if (code == -1) { if (code == -1) {
sdbRelease(pSdb, pStream);
break; break;
} }
sdbRelease(pSdb, pStream);
} }
if (code == 0) { if (code == 0) {
if (mndTransPrepare(pMnode, pTrans) != 0) { if (mndTransPrepare(pMnode, pTrans) != 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册