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

[BUG] donnot report error during remove callback when kill -15

Browse Source
This commit is contained in:
Handora
2023-06-15 10:42:27 +00:00
committed by ob-robot
parent 5276bcaea0
commit 77bb2077fc
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/storage/concurrency_control/ob_multi_version_garbage_collector.cpp
View File

@ -1363,9 +1363,9 @@ bool GetMinActiveSnapshotVersionFunctor::operator()(sql::ObSQLSessionMgr::Key ke
if (desc_snapshot.is_valid()) { if (desc_snapshot.is_valid()) {
snapshot_version = desc_snapshot; snapshot_version = desc_snapshot;
} }
MVCC_LOG(DEBUG, "RR/SI txn with tx_desc", K(MTL_ID()), KPC(tx_desc), KPC(sess_info), MVCC_LOG(DEBUG, "RR/SI txn with tx_desc", K(MTL_ID()), KPC(sess_info),
K(snapshot_version), K(min_active_snapshot_version_), K(desc_snapshot), K(snapshot_version), K(min_active_snapshot_version_), K(desc_snapshot),
K(sess_snapshot)); K(sess_snapshot), K(desc_snapshot));
} else if (transaction::ObTxIsolationLevel::RC == tx_desc->get_isolation_level()) { } else if (transaction::ObTxIsolationLevel::RC == tx_desc->get_isolation_level()) {
// Case 2: RC with tx desc exists, it may exists that snapshot is get from // Case 2: RC with tx desc exists, it may exists that snapshot is get from
// the executor and not maintained in the session and tx desc. So we need // the executor and not maintained in the session and tx desc. So we need
@ -1382,16 +1382,17 @@ bool GetMinActiveSnapshotVersionFunctor::operator()(sql::ObSQLSessionMgr::Key ke
snapshot_version.convert_from_ts(sess_info->get_cur_state_start_time() snapshot_version.convert_from_ts(sess_info->get_cur_state_start_time()
- 5L * 1000L * 1000L * 60L); - 5L * 1000L * 1000L * 60L);
MVCC_LOG(INFO, "RC txn with tx_desc while from session start time", MVCC_LOG(INFO, "RC txn with tx_desc while from session start time",
K(MTL_ID()), KPC(tx_desc), KPC(sess_info), K(snapshot_version), K(MTL_ID()), KPC(sess_info), K(snapshot_version),
K(min_active_snapshot_version_), K(sess_info->get_cur_state_start_time())); K(min_active_snapshot_version_),
K(sess_info->get_cur_state_start_time()));
} }
} }
MVCC_LOG(DEBUG, "RC txn with tx_desc", K(MTL_ID()), KPC(tx_desc), KPC(sess_info), MVCC_LOG(DEBUG, "RC txn with tx_desc", K(MTL_ID()), KPC(sess_info),
K(snapshot_version), K(min_active_snapshot_version_), K(desc_snapshot), K(snapshot_version), K(min_active_snapshot_version_), K(desc_snapshot),
K(sess_snapshot)); K(sess_snapshot), K(desc_snapshot));
} else { } else {
MVCC_LOG(INFO, "unknown txn with tx_desc", K(MTL_ID()), KPC(tx_desc), KPC(sess_info), MVCC_LOG(INFO, "unknown txn with tx_desc", K(MTL_ID()), KPC(sess_info),
K(snapshot_version), K(min_active_snapshot_version_)); K(snapshot_version), K(min_active_snapshot_version_), K(desc_snapshot));
} }
} else { } else {
share::SCN sess_snapshot = sess_info->get_reserved_snapshot_version(); share::SCN sess_snapshot = sess_info->get_reserved_snapshot_version();

1
src/storage/tx/ob_trans_service.cpp
View File

@ -630,7 +630,6 @@ int ObTransService::remove_callback_for_uncommited_txn(
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_UNLIKELY(!is_running_)) { } else if (OB_UNLIKELY(!is_running_)) {
TRANS_LOG(WARN, "ObTransService is not running"); TRANS_LOG(WARN, "ObTransService is not running");
ret = OB_NOT_RUNNING;
} else if (OB_ISNULL(memtable_set)) { } else if (OB_ISNULL(memtable_set)) {
TRANS_LOG(WARN, "memtable is NULL"); TRANS_LOG(WARN, "memtable is NULL");
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;