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

[DeadLock] unregister detector if tx implicit aborted in first write sql

Browse Source
This commit is contained in:
obdev
2023-02-24 14:10:44 +00:00
committed by ob-robot
parent b6a4cddede
commit a781dd3676
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/ob_sql_trans_control.cpp
View File

@ -837,8 +837,10 @@ int ObSqlTransControl::end_stmt(ObExecContext &exec_ctx, const bool rollback)
OZ (get_tx_service(session, txs), *session);
// plain select stmt don't require txn descriptor
if (OB_SUCC(ret) && !is_plain_select) {
ObTransDeadlockDetectorAdapter::maintain_deadlock_info_when_end_stmt(exec_ctx, rollback);
CK (OB_NOT_NULL(tx_desc));
ObTransID tx_id_before_rollback;
OX (tx_id_before_rollback = tx_desc->get_tx_id());
OX (ObTransDeadlockDetectorAdapter::maintain_deadlock_info_when_end_stmt(exec_ctx, rollback));
auto &tx_result = session->get_trans_result();
if (OB_FAIL(ret)) {
} else if (tx_result.is_incomplete()) {
@ -854,6 +856,15 @@ int ObSqlTransControl::end_stmt(ObExecContext &exec_ctx, const bool rollback)
OZ (txs->rollback_to_implicit_savepoint(*tx_desc, savepoint, stmt_expire_ts, &touched_ls),
savepoint, stmt_expire_ts, touched_ls);
}
// this may happend cause tx may implicit aborted
// (for example: first write sql of implicit started trans meet lock conflict)
// and if associated detector is created, must clean it also
if (OB_NOT_NULL(tx_desc) && tx_desc->get_tx_id() != tx_id_before_rollback) {
ObTransDeadlockDetectorAdapter::
unregister_from_deadlock_detector(tx_id_before_rollback,
ObTransDeadlockDetectorAdapter::
UnregisterPath::TX_ROLLBACK_IN_END_STMT);
}
}
// call end stmt hook
if (OB_NOT_NULL(tx_desc) && OB_NOT_NULL(txs) && OB_NOT_NULL(session)) {