hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Adjust info log in deadlock adaptor to trace log

Browse Source
This commit is contained in:
ZenoWang
2023-05-09 06:08:42 +00:00
committed by ob-robot
parent a7800921dd
commit b897e336aa
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/storage/tx/ob_trans_deadlock_adapter.cpp
View File

@ -641,7 +641,7 @@ int ObTransDeadlockDetectorAdapter::maintain_deadlock_info_when_end_stmt(sql::Ob
ret = OB_BAD_NULL_ERROR; ret = OB_BAD_NULL_ERROR;
DETECT_LOG(ERROR, "session is NULL", PRINT_WRAPPER); DETECT_LOG(ERROR, "session is NULL", PRINT_WRAPPER);
} else if (++step && session->is_inner()) { } else if (++step && session->is_inner()) {
DETECT_LOG(INFO, "inner session no need register to deadlock", PRINT_WRAPPER); DETECT_LOG(TRACE, "inner session no need register to deadlock", PRINT_WRAPPER);
} else if (++step && OB_ISNULL(desc = session->get_tx_desc())) { } else if (++step && OB_ISNULL(desc = session->get_tx_desc())) {
ret = OB_BAD_NULL_ERROR; ret = OB_BAD_NULL_ERROR;
DETECT_LOG(ERROR, "desc in session is NULL", PRINT_WRAPPER); DETECT_LOG(ERROR, "desc in session is NULL", PRINT_WRAPPER);
@ -670,13 +670,16 @@ int ObTransDeadlockDetectorAdapter::maintain_deadlock_info_when_end_stmt(sql::Ob
} }
} else {// statment is done, will not try again, all related deadlock info should be resetted } else {// statment is done, will not try again, all related deadlock info should be resetted
unregister_from_deadlock_detector(desc->tid(), UnregisterPath::END_STMT_DONE); unregister_from_deadlock_detector(desc->tid(), UnregisterPath::END_STMT_DONE);
DETECT_LOG(INFO, "try unregister from deadlock detector", KR(ret), K(desc->tid())); DETECT_LOG(TRACE, "try unregister from deadlock detector", KR(ret), K(desc->tid()));
} }
if (OB_NOT_NULL(desc)) {// whether registered or not, clean conflict info anyway if (OB_NOT_NULL(desc)) {// whether registered or not, clean conflict info anyway
desc->reset_conflict_txs(); desc->reset_conflict_txs();
} }
if (OB_SUCCESS != exec_ctx.get_errcode()) { int exec_ctx_err_code = exec_ctx.get_errcode();
DETECT_LOG(INFO, "maintain deadlock info", PRINT_WRAPPER); if (OB_SUCCESS != exec_ctx_err_code) {
if ((OB_ITER_END != exec_ctx_err_code) && (2 != step)) {
DETECT_LOG(INFO, "maintain deadlock info", PRINT_WRAPPER);
}
} }
return ret; return ret;
#undef PRINT_WRAPPER #undef PRINT_WRAPPER