This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch branch-1.2-lts in repository https://gitbox.apache.org/repos/asf/doris.git
commit f01f8784cbc18dcdcefb75cdfe4583a7303397d3 Author: Xin Liao <[email protected]> AuthorDate: Tue Jun 6 17:49:01 2023 +0800 [fix](merge-on-write) fix that set_txn_related_delete_bitmap may coredump (#20300) --- be/src/olap/txn_manager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/be/src/olap/txn_manager.cpp b/be/src/olap/txn_manager.cpp index 945302fa18..8f9f5b643c 100644 --- a/be/src/olap/txn_manager.cpp +++ b/be/src/olap/txn_manager.cpp @@ -184,14 +184,18 @@ void TxnManager::set_txn_related_delete_bitmap(TPartitionId partition_id, std::lock_guard<std::shared_mutex> wrlock(_get_txn_map_lock(transaction_id)); txn_tablet_map_t& txn_tablet_map = _get_txn_tablet_map(transaction_id); auto it = txn_tablet_map.find(key); - DCHECK(it != txn_tablet_map.end()); if (it == txn_tablet_map.end()) { LOG(WARNING) << "transaction_id: " << transaction_id << " partition_id: " << partition_id << " may be cleared"; return; } auto load_itr = it->second.find(tablet_info); - DCHECK(load_itr != it->second.end()); + if (load_itr == it->second.end()) { + LOG(WARNING) << "transaction_id: " << transaction_id + << " partition_id: " << partition_id << " tablet_id: " << tablet_id + << " may be cleared"; + return; + } TabletTxnInfo& load_info = load_itr->second; load_info.unique_key_merge_on_write = unique_key_merge_on_write; load_info.delete_bitmap = delete_bitmap; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
