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

[tx-route] reinit_tx should use lock protect

Browse Source
This commit is contained in:
chinaxing
2024-04-15 15:50:57 +00:00
committed by ob-robot
parent d6bfde0355
commit 89076de1ab
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,12 +445,23 @@ int ObTransService::txn_free_route__update_static_state(const uint32_t session_i
} else if (tx->tx_id_ != header.tx_id_) { } else if (tx->tx_id_ != header.tx_id_) {
// replace // replace
audit_record.replace_tx_ = true; audit_record.replace_tx_ = true;
ObSpinLockGuard guard(tx->lock_);
if (!tx->flags_.SHADOW_) { if (!tx->flags_.SHADOW_) {
// sanity check:
// the trx on current session isn't active and hasn't uncommitted extra state
if (TX_START_OR_RESUME_ADDR(tx) == GCONF.self_addr_ && tx->in_tx_or_has_extra_state_()) {
ret = OB_ERR_UNEXPECTED;
TRANS_LOG(WARN, "try replace active tx on tx start node", K(ret), KPC(tx));
tx->print_trace_();
} else {
tx_desc_mgr_.remove(*tx); tx_desc_mgr_.remove(*tx);
} }
}
if (OB_SUCC(ret)) {
// reset tx to cleanup for new txn // reset tx to cleanup for new txn
reinit_tx_(*tx, session_id, tx->get_cluster_version()); reinit_tx_(*tx, session_id, tx->get_cluster_version());
need_add_tx = true; need_add_tx = true;
}
} else { } else {
// update // update
// NOTE: for XA join/resume will cause `static state` re-synced // NOTE: for XA join/resume will cause `static state` re-synced