From 77bb2077fc519bb825a23b6caa81ca09465fb853 Mon Sep 17 00:00:00 2001 From: Handora Date: Thu, 15 Jun 2023 10:42:27 +0000 Subject: [PATCH] [BUG] donnot report error during remove callback when kill -15 --- .../ob_multi_version_garbage_collector.cpp | 17 +++++++++-------- src/storage/tx/ob_trans_service.cpp | 1 - 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/storage/concurrency_control/ob_multi_version_garbage_collector.cpp b/src/storage/concurrency_control/ob_multi_version_garbage_collector.cpp index a42f7d7d4..51db719a0 100644 --- a/src/storage/concurrency_control/ob_multi_version_garbage_collector.cpp +++ b/src/storage/concurrency_control/ob_multi_version_garbage_collector.cpp @@ -1363,9 +1363,9 @@ bool GetMinActiveSnapshotVersionFunctor::operator()(sql::ObSQLSessionMgr::Key ke if (desc_snapshot.is_valid()) { 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(sess_snapshot)); + K(sess_snapshot), K(desc_snapshot)); } 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 // 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() - 5L * 1000L * 1000L * 60L); 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(min_active_snapshot_version_), K(sess_info->get_cur_state_start_time())); + K(MTL_ID()), KPC(sess_info), K(snapshot_version), + 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(sess_snapshot)); + K(sess_snapshot), K(desc_snapshot)); } else { - MVCC_LOG(INFO, "unknown txn with tx_desc", K(MTL_ID()), KPC(tx_desc), KPC(sess_info), - K(snapshot_version), K(min_active_snapshot_version_)); + MVCC_LOG(INFO, "unknown txn with tx_desc", K(MTL_ID()), KPC(sess_info), + K(snapshot_version), K(min_active_snapshot_version_), K(desc_snapshot)); } } else { share::SCN sess_snapshot = sess_info->get_reserved_snapshot_version(); diff --git a/src/storage/tx/ob_trans_service.cpp b/src/storage/tx/ob_trans_service.cpp index 9cdd22b5b..c760b8c0e 100644 --- a/src/storage/tx/ob_trans_service.cpp +++ b/src/storage/tx/ob_trans_service.cpp @@ -630,7 +630,6 @@ int ObTransService::remove_callback_for_uncommited_txn( ret = OB_NOT_INIT; } else if (OB_UNLIKELY(!is_running_)) { TRANS_LOG(WARN, "ObTransService is not running"); - ret = OB_NOT_RUNNING; } else if (OB_ISNULL(memtable_set)) { TRANS_LOG(WARN, "memtable is NULL"); ret = OB_INVALID_ARGUMENT;