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

[4.2] skip kill tx if session is deserialized

Browse Source
This commit is contained in:
chinaxing
2023-04-26 14:00:00 +00:00
committed by ob-robot
parent e88d9ca03e
commit 003cdcc36a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/ob_sql_trans_control.cpp
View File

@ -337,10 +337,10 @@ int ObSqlTransControl::kill_idle_timeout_tx(ObSQLSessionInfo *session)
int ObSqlTransControl::kill_tx(ObSQLSessionInfo *session, int cause) int ObSqlTransControl::kill_tx(ObSQLSessionInfo *session, int cause)
{ {
auto session_id = session->get_sessid();
LOG_INFO("begin to kill tx", K(cause), K(session_id), KPC(session));
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (session->is_in_transaction()) { if (!session->get_is_deserialized() && session->is_in_transaction()) {
auto session_id = session->get_sessid();
LOG_INFO("begin to kill tx", K(cause), K(session_id), KPC(session));
transaction::ObTxDesc *tx_desc = session->get_tx_desc(); transaction::ObTxDesc *tx_desc = session->get_tx_desc();
auto tx_tenant_id = tx_desc->get_tenant_id(); auto tx_tenant_id = tx_desc->get_tenant_id();
const ObTransID tx_id = tx_desc->get_tx_id(); const ObTransID tx_id = tx_desc->get_tx_id();

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

@ -157,7 +157,7 @@ int ObTransService::acquire_tx(const char* buf,
} }
if (tx) { if (tx) {
REC_TRANS_TRACE_EXT(&tx->get_tlog(), deserialize, REC_TRANS_TRACE_EXT(&tx->get_tlog(), deserialize,
OB_ID(addr), (void*)&tx, OB_ID(addr), (void*)tx,
OB_ID(txid), tx->tx_id_); OB_ID(txid), tx->tx_id_);
} }
TRANS_LOG(TRACE, "acquire tx by deserialize", K(ret), K(*this), KP(buf), KPC(tx)); TRANS_LOG(TRACE, "acquire tx by deserialize", K(ret), K(*this), KP(buf), KPC(tx));