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

[CP] fix tx desc refer leak bug

Browse Source
This commit is contained in:
felix-w15
2023-11-27 13:16:53 +00:00
committed by ob-robot
parent 3084e3a949
commit 7c82708e82
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/tx/ob_trans_service_v4.cpp
View File

@ -363,7 +363,8 @@ int ObTransService::handle_tx_commit_timeout(ObTxDesc &tx, const int64_t delay)
int64_t now = ObClockGenerator::getClock(); int64_t now = ObClockGenerator::getClock();
if (!tx.commit_task_.is_registered()){ if (!tx.commit_task_.is_registered()){
TRANS_LOG(INFO, "task canceled", K(tx)); TRANS_LOG(INFO, "task canceled", K(tx));
} else if (FALSE_IT(tx.commit_task_.set_registered(false))) { } else if (OB_FAIL(unregister_commit_retry_task_(tx))) {
TRANS_LOG(ERROR, "deregister timeout task fail", K(tx), K(ret));
} else if (tx.flags_.RELEASED_) { } else if (tx.flags_.RELEASED_) {
TRANS_LOG(INFO, "tx released, cancel commit retry", K(tx)); TRANS_LOG(INFO, "tx released, cancel commit retry", K(tx));
} else if (tx.state_ != ObTxDesc::State::IN_TERMINATE) { } else if (tx.state_ != ObTxDesc::State::IN_TERMINATE) {
@ -2799,9 +2800,10 @@ int ObTransService::handle_timeout_for_xa(ObTxDesc &tx, const int64_t delay)
tx_id = tx.tx_id_; tx_id = tx.tx_id_;
if (!tx.commit_task_.is_registered()){ if (!tx.commit_task_.is_registered()){
TRANS_LOG(INFO, "task canceled", K(tx)); TRANS_LOG(INFO, "task canceled", K(tx));
} else if(OB_FAIL(unregister_commit_retry_task_(tx))) {
TRANS_LOG(ERROR, "deregister timeout task fail", K(tx), K(ret));
} else if (tx.flags_.RELEASED_) { } else if (tx.flags_.RELEASED_) {
TRANS_LOG(INFO, "tx released, cancel commit retry", K(tx)); TRANS_LOG(INFO, "tx released, cancel commit retry", K(tx));
} else if (FALSE_IT(tx.commit_task_.set_registered(false))) {
} else { } else {
if (ObTxDesc::State::SUB_PREPARING == tx.state_) { if (ObTxDesc::State::SUB_PREPARING == tx.state_) {
ret = handle_sub_prepare_timeout_(tx, delay); ret = handle_sub_prepare_timeout_(tx, delay);