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

[DeadLock] fix error log printing and un-init var

Browse Source
This commit is contained in:
obdev
2022-11-28 06:43:00 +00:00
committed by ob-robot
parent a0a66ba1ca
commit b933847054
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/deadlock/ob_lcl_scheme/ob_lcl_node.cpp
View File

@ -872,7 +872,7 @@ bool ObLCLNode::if_phase_match_(const int64_t ts,
return ret; return ret;
} }
ObLCLNode::PushStateTask::PushStateTask(ObLCLNode &node) :lcl_node_(node) {} ObLCLNode::PushStateTask::PushStateTask(ObLCLNode &node) : expected_executed_ts(0), lcl_node_(node) {}
void ObLCLNode::PushStateTask::runTimerTask() void ObLCLNode::PushStateTask::runTimerTask()
{ {

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

@ -461,7 +461,7 @@ int ObTransDeadlockDetectorAdapter::get_trans_start_time_and_scheduler_from_sess
DETECT_LOG(ERROR, "get session failed", PRINT_WRAPPER); DETECT_LOG(ERROR, "get session failed", PRINT_WRAPPER);
} else if (OB_ISNULL(guard->get_tx_desc())) { } else if (OB_ISNULL(guard->get_tx_desc())) {
ret = OB_BAD_NULL_ERROR; ret = OB_BAD_NULL_ERROR;
DETECT_LOG(ERROR, "desc on session is NULL", PRINT_WRAPPER); DETECT_LOG(WARN, "desc on session is NULL", PRINT_WRAPPER);
} else if (guard->get_tx_desc()->get_addr() != GCTX.self_addr()) { } else if (guard->get_tx_desc()->get_addr() != GCTX.self_addr()) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
DETECT_LOG(ERROR, "this not happened on scheduler", PRINT_WRAPPER, K(guard->get_tx_desc()->get_addr())); DETECT_LOG(ERROR, "this not happened on scheduler", PRINT_WRAPPER, K(guard->get_tx_desc()->get_addr()));