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

[4.x][xa] refine print error for implicit end trans in xa

Browse Source
This commit is contained in:
jw-guo
2024-03-01 08:14:41 +00:00
committed by ob-robot
parent df170f345f
commit c21fe46166
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/ob_sql_trans_control.cpp
View File

@ -210,7 +210,7 @@ int ObSqlTransControl::implicit_end_trans(ObExecContext &exec_ctx,
CK (OB_NOT_NULL(session)); CK (OB_NOT_NULL(session));
if (OB_SUCCESS != ret) { if (OB_SUCCESS != ret) {
// do nothing // do nothing
} else if (session->associated_xa()) { } else if (!session->is_inner() && session->associated_xa()) {
// NOTE that not support dblink trans in this interface // NOTE that not support dblink trans in this interface
// PLEASE handle implicit cases for dblink trans instead of this interface // PLEASE handle implicit cases for dblink trans instead of this interface
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
@ -448,7 +448,7 @@ int ObSqlTransControl::do_end_trans_(ObSQLSessionInfo *session,
ObTransDeadlockDetectorAdapter::unregister_from_deadlock_detector(tx_ptr->tid(), ObTransDeadlockDetectorAdapter::unregister_from_deadlock_detector(tx_ptr->tid(),
ObTransDeadlockDetectorAdapter::UnregisterPath::DO_END_TRANS); ObTransDeadlockDetectorAdapter::UnregisterPath::DO_END_TRANS);
} }
if (session->associated_xa() && !is_explicit) { if (!session->is_inner() && session->associated_xa() && !is_explicit) {
ret = OB_TRANS_XA_RMFAIL; ret = OB_TRANS_XA_RMFAIL;
LOG_ERROR("executing do end trans in xa", K(ret), K(session->get_xid()), KPC(tx_ptr)); LOG_ERROR("executing do end trans in xa", K(ret), K(session->get_xid()), KPC(tx_ptr));
} else { } else {