提交 85496aec 编写于 作者: H handora 提交者: wangzelin.wzl

add new cp to opensource

上级 c1aac4e2
......@@ -1462,7 +1462,8 @@ int ObMvccRowCallback::clean_dirty_cb()
{
int ret = OB_SUCCESS;
if (marked_for_logging_) {
if (marked_for_logging_ || need_fill_redo_) {
// dirty callbacks
unlink_trans_node();
dec_pending_cb_count();
marked_for_logging_ = false;
......
......@@ -7397,7 +7397,8 @@ int ObPartTransCtx::handle_2pc_prepare_request_raw_(int status)
// The coordinator will retry on failure
ret = OB_SUCCESS;
} else if (OB_SUCCESS != get_status_() || OB_SUCCESS != status) {
if (OB_FAIL(alloc_local_trans_version_(OB_LOG_TRANS_REDO_WITH_PREPARE))) {
TRANS_LOG(WARN, "2pc prepare status not ok, write prepare-no", K(status), K(status_), K(*this));
if (OB_FAIL(alloc_local_trans_version_(OB_LOG_TRANS_PREPARE))) {
if (OB_EAGAIN != ret) {
TRANS_LOG(WARN, "alloc log id and timestamp error", KR(ret), "context", *this);
} else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册