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

fix tx desc reference leak

Browse Source
This commit is contained in:
obdev
2023-02-24 13:14:19 +00:00
committed by ob-robot
parent 50329218dc
commit 5ef5dd6fae
1 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,6 +263,7 @@ int ObTransService::register_commit_retry_task_(ObTxDesc &tx, int64_t max_delay)
{ {
const int64_t MIN_DELAY = 50 * 1000;// 50ms const int64_t MIN_DELAY = 50 * 1000;// 50ms
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int saved_ret = OB_SUCCESS;
max_delay = max_delay == INT64_MAX ? ObTransCtx::MAX_TRANS_2PC_TIMEOUT_US : max_delay; max_delay = max_delay == INT64_MAX ? ObTransCtx::MAX_TRANS_2PC_TIMEOUT_US : max_delay;
int64_t now = ObClockGenerator::getClock(); int64_t now = ObClockGenerator::getClock();
int64_t expire_after = std::min(tx.expire_ts_ - now, tx.commit_expire_ts_ - now); int64_t expire_after = std::min(tx.expire_ts_ - now, tx.commit_expire_ts_ - now);
@ -278,6 +279,11 @@ int ObTransService::register_commit_retry_task_(ObTxDesc &tx, int64_t max_delay)
if (OB_FAIL(timer_.register_timeout_task(tx.commit_task_, delay))) { if (OB_FAIL(timer_.register_timeout_task(tx.commit_task_, delay))) {
TRANS_LOG(WARN, "register tx retry task fail", KR(ret), K(delay), K(tx)); TRANS_LOG(WARN, "register tx retry task fail", KR(ret), K(delay), K(tx));
tx_desc_mgr_.revert(tx); tx_desc_mgr_.revert(tx);
if (OB_TIMER_TASK_HAS_SCHEDULED == ret) {
saved_ret = ret;
// rewrite ret
ret = OB_SUCCESS;
}
} }
} }
#ifndef NDEBUG #ifndef NDEBUG
@ -288,7 +294,8 @@ int ObTransService::register_commit_retry_task_(ObTxDesc &tx, int64_t max_delay)
} }
#endif #endif
ObTransTraceLog &tlog = tx.get_tlog(); ObTransTraceLog &tlog = tx.get_tlog();
REC_TRANS_TRACE_EXT(&tlog, register_timeout_task, OB_Y(ret), REC_TRANS_TRACE_EXT(&tlog, register_timeout_task,
OB_ID(ret), OB_SUCCESS != ret ? ret : saved_ret,
OB_ID(arg), delay, OB_ID(arg), delay,
OB_ID(ref), tx.get_ref()); OB_ID(ref), tx.get_ref());
return ret; return ret;
@ -336,49 +343,45 @@ int ObTransService::handle_tx_commit_timeout(ObTxDesc &tx, const int64_t delay)
int32_t ref_cnt = 0; int32_t ref_cnt = 0;
// remember tx_id because tx maybe cleanout and reused // remember tx_id because tx maybe cleanout and reused
// in this function's following steps. // in this function's following steps.
tx.lock_.lock();
auto tx_id = tx.tx_id_; auto tx_id = tx.tx_id_;
int64_t now = ObClockGenerator::getClock(); int64_t now = ObClockGenerator::getClock();
bool cb_executed = false; bool cb_executed = false;
if (OB_FAIL(tx.lock_.lock(5000000))) { if (!tx.commit_task_.is_registered()){
TRANS_LOG(WARN, "failed to acquire lock in specified time", K(tx)); TRANS_LOG(INFO, "task canceled", K(tx));
// FIXME: how to handle it without lock protection } else if (FALSE_IT(tx.commit_task_.set_registered(false))) {
} else if (tx.flags_.RELEASED_) {
TRANS_LOG(INFO, "tx released, cancel commit retry", K(tx));
} else if (tx.state_ != ObTxDesc::State::IN_TERMINATE) {
ret = OB_ERR_UNEXPECTED;
TRANS_LOG(WARN, "unexpect tx state", K(ret), K_(tx.state), K(tx));
} else if (tx.expire_ts_ <= now) {
TRANS_LOG(WARN, "tx has timeout", K_(tx.expire_ts), K(tx));
handle_tx_commit_result_(tx, OB_TRANS_TIMEOUT);
} else if (tx.commit_expire_ts_ <= now) {
TRANS_LOG(WARN, "tx commit timeout", K_(tx.commit_expire_ts), K(tx));
handle_tx_commit_result_(tx, OB_TRANS_STMT_TIMEOUT);
} else { } else {
if (!tx.commit_task_.is_registered()){ ObTxCommitMsg commit_msg;
TRANS_LOG(INFO, "task canceled", K(tx)); if (OB_FAIL(build_tx_commit_msg_(tx, commit_msg))) {
} else if (FALSE_IT(timer_.unregister_timeout_task(tx.commit_task_))) { TRANS_LOG(WARN, "build tx commit msg fail", K(ret), K(tx));
} else if (tx.flags_.RELEASED_) { } else if (OB_FAIL(rpc_->post_msg(tx.coord_id_, commit_msg))) {
TRANS_LOG(INFO, "tx released, cancel commit retry", K(tx)); TRANS_LOG(WARN, "post commit msg fail", K(ret), K(tx));
} else if (tx.state_ != ObTxDesc::State::IN_TERMINATE) { }
ret = OB_ERR_UNEXPECTED; // register again
TRANS_LOG(WARN, "unexpect tx state", K(ret), K_(tx.state), K(tx)); if (OB_FAIL(ret)) {
} else if (tx.expire_ts_ <= now) { if (OB_FAIL(register_commit_retry_task_(tx, POST_COMMIT_REQ_RETRY_INTERVAL))) {
TRANS_LOG(WARN, "tx has timeout", K_(tx.expire_ts), K(tx)); TRANS_LOG(WARN, "reregister task fail", K(ret), K(tx));
handle_tx_commit_result_(tx, OB_TRANS_TIMEOUT);
} else if (tx.commit_expire_ts_ <= now) {
TRANS_LOG(WARN, "tx commit timeout", K_(tx.commit_expire_ts), K(tx));
handle_tx_commit_result_(tx, OB_TRANS_STMT_TIMEOUT);
} else {
ObTxCommitMsg commit_msg;
if (OB_FAIL(build_tx_commit_msg_(tx, commit_msg))) {
TRANS_LOG(WARN, "build tx commit msg fail", K(ret), K(tx));
} else if (OB_FAIL(rpc_->post_msg(tx.coord_id_, commit_msg))) {
TRANS_LOG(WARN, "post commit msg fail", K(ret), K(tx));
} }
// register again } else {
if (OB_FAIL(ret)) { if (OB_FAIL(register_commit_retry_task_(tx))) {
if (OB_FAIL(register_commit_retry_task_(tx, POST_COMMIT_REQ_RETRY_INTERVAL))) { TRANS_LOG(WARN, "reregister task fail", K(ret), K(tx));
TRANS_LOG(WARN, "reregister task fail", K(ret), K(tx));
}
} else {
if (OB_FAIL(register_commit_retry_task_(tx))) {
TRANS_LOG(WARN, "reregister task fail", K(ret), K(tx));
}
} }
} }
ref_cnt = tx.get_ref();
tx.lock_.unlock();
cb_executed = tx.execute_commit_cb();
} }
ref_cnt = tx.get_ref();
tx.lock_.unlock();
cb_executed = tx.execute_commit_cb();
// NOTE: // NOTE:
// it not safe and meaningless to access tx after commit_cb // it not safe and meaningless to access tx after commit_cb
// has been called, the tx may has been reused or release // has been called, the tx may has been reused or release